diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-06 01:32:22 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-06-10 00:12:37 +0200 |
| commit | 992cdbc56a56ea9d6ccd6853e60107b438eb0bc3 (patch) | |
| tree | d2b1c3d7b434f416e6b60fd08d15b39ecfe8e400 | |
| parent | e8bb67c2a912618a41108c1f13178630f0f85471 (diff) | |
| download | ffmpeg-992cdbc56a56ea9d6ccd6853e60107b438eb0bc3.tar.gz | |
avcodec/mjpegdec: Improve intel jpeg flip heuristic
Fixes Ticket3698
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0545ef7116db1e87894d978bfa400578652c716d)
| -rw-r--r-- | libavcodec/mjpegdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index bafdf3a691..ad00323556 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1656,7 +1656,7 @@ static int mjpeg_decode_com(MJpegDecodeContext *s) s->interlace_polarity = 1; } else if (!strcmp(cbuf, "CS=ITU601")) s->cs_itu601 = 1; - else if ((!strncmp(cbuf, "Intel(R) JPEG Library, version 1", 32)) || + else if ((!strncmp(cbuf, "Intel(R) JPEG Library, version 1", 32) && s->avctx->codec_tag) || (!strncmp(cbuf, "Metasoft MJPEG Codec", 20))) s->flipped = 1; |