diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-17 18:56:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-17 19:05:44 +0100 |
| commit | 13f8bbfb7051093e27ca2f4305f8a8bf88b679c9 (patch) | |
| tree | 2be7116e3a4b4dec0d7458b35b03620edd924068 /libavformat | |
| parent | 6cd079a4e7ce1805b7efa8a7c8cf03e9e9c46714 (diff) | |
| download | ffmpeg-13f8bbfb7051093e27ca2f4305f8a8bf88b679c9.tar.gz | |
avformat/mov: fix mis-detection of jpeg2000
Fixes demuxer choice for Ticket 2792
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mov.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index de4004f3cc..1170dd489d 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3664,7 +3664,9 @@ static int mov_probe(AVProbeData *p) AV_RB64(p->buf+offset + 8) == 0)) { score = FFMAX(score, AVPROBE_SCORE_EXTENSION); } else if (tag == MKTAG('f','t','y','p') && - AV_RL32(p->buf + offset + 8) == MKTAG('j','p','2',' ')) { + ( AV_RL32(p->buf + offset + 8) == MKTAG('j','p','2',' ') + || AV_RL32(p->buf + offset + 8) == MKTAG('j','p','x',' ') + )) { score = FFMAX(score, 5); } else { score = AVPROBE_SCORE_MAX; |