diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-22 18:23:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-22 18:23:53 +0200 |
| commit | bc15b5238f9984458b5cceb99670e9db53fc74f1 (patch) | |
| tree | 098296bead20011865d6e675374c7da230f572ca | |
| parent | ed248e7f70d98abe099392e154d1cdd0f15faa3c (diff) | |
| parent | 050d79b6ddaf2c675ae89b77e5f9e82dcb3fba58 (diff) | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Autodetect big-endian tiff files.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/img2dec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index f97800797e..cf51c0bb09 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -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; } |