Browse Source

Merge remote-tracking branch 'cehoyos/master'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.4
Michael Niedermayer 11 years ago
parent
commit
bc15b5238f
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      libavformat/img2dec.c

+ 2
- 1
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;
}


Loading…
Cancel
Save