mirror of https://git.ffmpeg.org/ffmpeg.git
mm decoder: move buffer allocation from decode_init() to decode_frame().
this permits playback in ffplay when libavfilter is enabled.
This commit is contained in:
parent
435535e411
commit
6e1f0d5edf
|
@ -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,
|
||||||
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;
|
||||||
|
|
Loading…
Reference in New Issue