Browse Source

avformat/mov: fix mis-detection of jpeg2000

Fixes demuxer choice for Ticket 2792

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.7
Michael Niedermayer 11 years ago
parent
commit
13f8bbfb70
1 changed files with 3 additions and 1 deletions
  1. +3
    -1
      libavformat/mov.c

+ 3
- 1
libavformat/mov.c View File

@@ -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;


Loading…
Cancel
Save