diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-19 18:01:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 20:31:05 +0100 |
| commit | b052525f9b347d662b745da98893f00acef1204e (patch) | |
| tree | f4d9330beded177037a85573823360f19bf126b6 | |
| parent | 90c7bfb9be432075fac32a23f5e0af48da35608a (diff) | |
| download | ffmpeg-b052525f9b347d662b745da98893f00acef1204e.tar.gz | |
avcodec/mjpegdec: Switch default interlaced polarity for MJPG to 1
Fixes Ticket3229
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit dde16f5aaed327e15049b40a8dfae1f59647e4ec)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mjpegdec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 23075943f2..cb8f2b9660 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 |