generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/mov: fix mis-detection of jpeg2000

Browse Source 
Fixes demuxer choice for Ticket 2792

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-03-17 18:56:24 +01:00
parent 6cd079a4e7
commit 13f8bbfb70
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/mov.c
View File

@@ -3664,7 +3664,9 @@ static int mov_probe(AVProbeData *p)
AV_RB64(p->buf+offset + 8) == 0)) { AV_RB64(p->buf+offset + 8) == 0)) {
score = FFMAX(score, AVPROBE_SCORE_EXTENSION); score = FFMAX(score, AVPROBE_SCORE_EXTENSION);
} else if (tag == MKTAG('f','t','y','p') && } 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); score = FFMAX(score, 5);
} else { } else {
score = AVPROBE_SCORE_MAX; score = AVPROBE_SCORE_MAX;