diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-06 01:32:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-06 01:32:22 +0200 |
| commit | 0545ef7116db1e87894d978bfa400578652c716d (patch) | |
| tree | 5cd56d2e72ecf15f9b351b3b75044a957beea2cd /libavcodec | |
| parent | 0a2004b6d11ff962361420c3150fe760cf1f7115 (diff) | |
| download | ffmpeg-streaming-0545ef7116db1e87894d978bfa400578652c716d.zip ffmpeg-streaming-0545ef7116db1e87894d978bfa400578652c716d.tar.gz | |
avcodec/mjpegdec: Improve intel jpeg flip heuristic
Fixes Ticket3698
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -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 6636dad..592e3bf 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1745,7 +1745,7 @@ static int mjpeg_decode_com(MJpegDecodeContext *s) parse_avid(s, cbuf, len); } 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; |
