diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-07-04 21:13:40 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-07-05 02:11:17 +0200 |
| commit | d919fdd4f7e8bf5354e99780181cdaedcf879fa5 (patch) | |
| tree | fb09acbe36bcc790e9328aa85c7cabfdd462dc8a | |
| parent | 939d22a297bf8a7e422eb7ebfda96ec12c5427d3 (diff) | |
| download | ffmpeg-d919fdd4f7e8bf5354e99780181cdaedcf879fa5.tar.gz | |
Do not detect jp2 images as mov files.
| -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 03ed6d4220..89ecc5400b 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3264,7 +3264,6 @@ static int mov_probe(AVProbeData *p) /* check for obvious tags */ case MKTAG('m','o','o','v'): moov_offset = offset + 4; - case MKTAG('j','P',' ',' '): /* jpeg 2000 signature */ case MKTAG('m','d','a','t'): case MKTAG('p','n','o','t'): /* detect movs with preview pics like ew.mov and april.mov */ case MKTAG('u','d','t','a'): /* Packet Video PVAuthor adds this and a lot of more junk */ @@ -3274,6 +3273,9 @@ static int mov_probe(AVProbeData *p) offset + 12 > (unsigned int)p->buf_size || 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',' ')) { + score = FFMAX(score, 5); } else { score = AVPROBE_SCORE_MAX; } |