virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Do not detect jp2 images as mov files.

Browse Source
This commit is contained in:
Carl Eugen Hoyos 2014-07-04 21:13:40 +02:00
parent 939d22a297
commit d919fdd4f7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/mov.c
View File

@ -3264,7 +3264,6 @@ static int mov_probe(AVProbeData *p)
/* check for obvious tags */ /* check for obvious tags */
case MKTAG('m','o','o','v'): case MKTAG('m','o','o','v'):
moov_offset = offset + 4; moov_offset = offset + 4;
case MKTAG('j','P',' ',' '): /* jpeg 2000 signature */
case MKTAG('m','d','a','t'): 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('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 */ 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 || offset + 12 > (unsigned int)p->buf_size ||
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') &&
AV_RL32(p->buf + offset + 8) == MKTAG('j','p','2',' ')) {
score = FFMAX(score, 5);
} else { } else {
score = AVPROBE_SCORE_MAX; score = AVPROBE_SCORE_MAX;
} }