generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/mjpegdec: Improve intel jpeg flip heuristic

Browse Source 
Fixes Ticket3698

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0545ef7116)
This commit is contained in:
Michael Niedermayer
2014-06-06 01:32:22 +02:00
committed by Carl Eugen Hoyos
parent e8bb67c2a9
commit 992cdbc56a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/mjpegdec.c
View File

@@ -1656,7 +1656,7 @@ static int mjpeg_decode_com(MJpegDecodeContext *s)
s->interlace_polarity = 1; s->interlace_polarity = 1;
} else if (!strcmp(cbuf, "CS=ITU601")) } else if (!strcmp(cbuf, "CS=ITU601"))
s->cs_itu601 = 1; 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))) (!strncmp(cbuf, "Metasoft MJPEG Codec", 20)))
s->flipped = 1; s->flipped = 1;