RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 17:32:06 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/mjpegdec: dont try to combine fields for decimated multiscope 2 material

Browse Source 
Fixes Ticket4535

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-06-21 02:39:38 +02:00
parent 9b747500f3
commit dde6b2a355
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/mjpegdec.c
View File

@ -367,6 +367,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
/* test interlaced mode */ /* test interlaced mode */
if (s->first_picture && if (s->first_picture &&
(s->multiscope != 2 || s->avctx->time_base.den >= 25 * s->avctx->time_base.num) &&
s->org_height != 0 && s->org_height != 0 &&
s->height < ((s->org_height * 3) / 4)) { s->height < ((s->org_height * 3) / 4)) {
s->interlaced = 1; 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) || else if ((!strncmp(cbuf, "Intel(R) JPEG Library, version 1", 32) && s->avctx->codec_tag) ||
(!strncmp(cbuf, "Metasoft MJPEG Codec", 20))) (!strncmp(cbuf, "Metasoft MJPEG Codec", 20)))
s->flipped = 1; s->flipped = 1;
else if (!strcmp(cbuf, "MULTISCOPE II"))
s->multiscope = 2;
av_free(cbuf); av_free(cbuf);
} }

1
libavcodec/mjpegdec.h
View File

@ -114,6 +114,7 @@ typedef struct MJpegDecodeContext {
int buggy_avid; int buggy_avid;
int cs_itu601; int cs_itu601;
int interlace_polarity; int interlace_polarity;
int multiscope;
int mjpb_skiptosod; int mjpb_skiptosod;