From dde16f5aaed327e15049b40a8dfae1f59647e4ec Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 19 Mar 2014 18:01:04 +0100 Subject: [PATCH] avcodec/mjpegdec: Switch default interlaced polarity for MJPG to 1 Fixes Ticket3229 Signed-off-by: Michael Niedermayer --- libavcodec/mjpegdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index d019f655f2..123e4d0da2 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -131,6 +131,9 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx) if (avctx->field_order == AV_FIELD_BB) { /* quicktime icefloe 019 */ s->interlace_polarity = 1; /* bottom field first */ av_log(avctx, AV_LOG_DEBUG, "bottom field first\n"); + } else if (avctx->field_order == AV_FIELD_UNKNOWN) { + if (avctx->codec_tag == AV_RL32("MJPG")) + s->interlace_polarity = 1; } if ( avctx->extradata_size > 8