Commit 6e7cf13b authored by Peter Ross's avatar Peter Ross Committed by Ronald S. Bultje
Browse files

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



This permits playback in ffplay when libavfilter is enabled.
Signed-off-by: default avatarRonald S. Bultje <rsbultje@gmail.com>
parent 7f05c164
...@@ -59,10 +59,6 @@ static av_cold int mm_decode_init(AVCodecContext *avctx) ...@@ -59,10 +59,6 @@ static av_cold int mm_decode_init(AVCodecContext *avctx)
avctx->pix_fmt = PIX_FMT_PAL8; avctx->pix_fmt = PIX_FMT_PAL8;
s->frame.reference = 1; s->frame.reference = 1;
if (avctx->get_buffer(avctx, &s->frame)) {
av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1;
}
return 0; return 0;
} }
...@@ -182,6 +178,11 @@ static int mm_decode_frame(AVCodecContext *avctx, ...@@ -182,6 +178,11 @@ static int mm_decode_frame(AVCodecContext *avctx,
buf += MM_PREAMBLE_SIZE; buf += MM_PREAMBLE_SIZE;
buf_size -= MM_PREAMBLE_SIZE; buf_size -= MM_PREAMBLE_SIZE;
if (avctx->reget_buffer(avctx, &s->frame) < 0) {
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
return -1;
}
switch(type) { switch(type) {
case MM_TYPE_PALETTE : mm_decode_pal(s, buf, buf_end); return buf_size; case MM_TYPE_PALETTE : mm_decode_pal(s, buf, buf_end); return buf_size;
case MM_TYPE_INTRA : mm_decode_intra(s, 0, 0, buf, buf_size); break; case MM_TYPE_INTRA : mm_decode_intra(s, 0, 0, buf, buf_size); break;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment