diff options
| author | Michael Niedermayer <[email protected]> | 2015-06-21 02:39:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-06-21 02:53:06 +0200 |
| commit | dde6b2a3554553434c9e3435de3c7e94c3affe03 (patch) | |
| tree | d37b979d46cceae3bfa77f5dfdec1c2bd8c01a0d | |
| parent | 9b747500f361305d4175b137394f233845cb7d54 (diff) | |
avcodec/mjpegdec: dont try to combine fields for decimated multiscope 2 material
Fixes Ticket4535
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavcodec/mjpegdec.c | 3 | ||||
| -rw-r--r-- | libavcodec/mjpegdec.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 1ce332833d..87c5862a49 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -367,6 +367,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) /* test interlaced mode */ if (s->first_picture && + (s->multiscope != 2 || s->avctx->time_base.den >= 25 * s->avctx->time_base.num) && s->org_height != 0 && s->height < ((s->org_height * 3) / 4)) { s->interlaced = 1; @@ -1830,6 +1831,8 @@ static int mjpeg_decode_com(MJpegDecodeContext *s) else if ((!strncmp(cbuf, "Intel(R) JPEG Library, version 1", 32) && s->avctx->codec_tag) || (!strncmp(cbuf, "Metasoft MJPEG Codec", 20))) s->flipped = 1; + else if (!strcmp(cbuf, "MULTISCOPE II")) + s->multiscope = 2; av_free(cbuf); } diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h index 28d3e4aa7d..fb811294a1 100644 --- a/libavcodec/mjpegdec.h +++ b/libavcodec/mjpegdec.h @@ -114,6 +114,7 @@ typedef struct MJpegDecodeContext { int buggy_avid; int cs_itu601; int interlace_polarity; + int multiscope; int mjpb_skiptosod; |