Commit 13f8bbfb authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/mov: fix mis-detection of jpeg2000

Fixes demuxer choice for Ticket 2792
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 6cd079a4
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment