virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

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

Browse Source 
This permits playback in ffplay when libavfilter is enabled.

Resolves ticket #60

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Peter Ross 2011-04-16 00:59:19 +10:00 committed by Michael Niedermayer
parent dc8e1b75e7
commit 62931e11d6
1 changed files with 4 additions and 5 deletions
Show Stats 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 {
AVFrame frame;
int palette[AVPALETTE_COUNT];
int x; ///< x coordinate position
} AnmContext;
@ -44,14 +45,10 @@ static av_cold int decode_init(AVCodecContext *avctx)
return -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;
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;
}
@ -170,6 +167,8 @@ static int decode_frame(AVCodecContext *avctx,
}
} while (buf + 1 < buf_end);
memcpy(s->frame.data[1], s->palette, AVPALETTE_SIZE);
*data_size = sizeof(AVFrame);
*(AVFrame*)data = s->frame;
return buf_size;