From 493296800c4cfd76561f71ded5f0893108063e67 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 19 Mar 2014 17:59:42 +0100 Subject: [PATCH] avcodec/mjpegdec: parse avid data from extradata Makes no difference for any file tested but is needed for following bug-fix Signed-off-by: Michael Niedermayer --- libavcodec/mjpegdec.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index c4f855b9bf..d019f655f2 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -132,6 +132,13 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx) s->interlace_polarity = 1; /* bottom field first */ av_log(avctx, AV_LOG_DEBUG, "bottom field first\n"); } + + if ( avctx->extradata_size > 8 + && AV_RL32(avctx->extradata) == 0x2C + && AV_RL32(avctx->extradata+4) == 0x18) { + parse_avid(s, avctx->extradata, avctx->extradata_size); + } + if (avctx->codec->id == AV_CODEC_ID_AMV) s->flipped = 1;