opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-29 12:26:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

anm decoder: move buffer allocation from decode_init() to decode_frame()

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Peter Ross
2012-03-12 23:42:53 +00:00
committed by Ronald S. Bultje
parent 3aa661ec56
commit 015da6e394
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/anm.c
View File

@ -29,6 +29,7 @@
typedef struct AnmContext { typedef struct AnmContext {
AVFrame frame; AVFrame frame;
int palette[AVPALETTE_COUNT];
int x; ///< x coordinate position int x; ///< x coordinate position
} AnmContext; } AnmContext;
@ -44,14 +45,10 @@ static av_cold int decode_init(AVCodecContext *avctx)
return -1; return -1;
s->frame.reference = 1; s->frame.reference = 1;
if (avctx->get_buffer(avctx, &s->frame) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1;
}
buf = avctx->extradata + 16*8; buf = avctx->extradata + 16*8;
for (i = 0; i < 256; i++) for (i = 0; i < 256; i++)
((uint32_t*)s->frame.data[1])[i] = bytestream_get_le32(&buf); s->palette[i] = bytestream_get_le32(&buf);
return 0; return 0;
} }
@ -172,6 +169,8 @@ static int decode_frame(AVCodecContext *avctx,
} }
} while (buf + 1 < buf_end); } while (buf + 1 < buf_end);
memcpy(s->frame.data[1], s->palette, AVPALETTE_SIZE);
*data_size = sizeof(AVFrame); *data_size = sizeof(AVFrame);
*(AVFrame*)data = s->frame; *(AVFrame*)data = s->frame;
return buf_size; return buf_size;