RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'cehoyos/master' 

* cehoyos/master:
  Autodetect big-endian tiff files.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-22 18:23:49 +02:00
parent ed248e7f70 050d79b6dd
commit bc15b5238f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/img2dec.c
View File

@ -652,7 +652,8 @@ static int tiff_probe(AVProbeData *p)
{
const uint8_t *b = p->buf;
if (AV_RB32(b) == 0x49492a00)
if (AV_RB32(b) == 0x49492a00 ||
AV_RB32(b) == 0x4D4D002a)
return AVPROBE_SCORE_EXTENSION + 1;
return 0;
}