virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avformat/mov: Heuristically detect raw udta

Browse Source 
Fixes tkhd+moov fragment provided by koda

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-02-13 04:20:55 +01:00
parent c7ad1f562b
commit 849ad5175b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/mov.c
View File

@@ -338,7 +338,7 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom)
case MKTAG(0xa9,'w','r','t'): key = "composer"; break; case MKTAG(0xa9,'w','r','t'): key = "composer"; break;
case MKTAG(0xa9,'x','y','z'): key = "location"; break; case MKTAG(0xa9,'x','y','z'): key = "location"; break;
} }
retry:
if (c->itunes_metadata && atom.size > 8) { if (c->itunes_metadata && atom.size > 8) {
int data_size = avio_rb32(pb); int data_size = avio_rb32(pb);
int tag = avio_rl32(pb); int tag = avio_rl32(pb);
@@ -358,6 +358,11 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom)
} else return 0; } else return 0;
} else if (atom.size > 4 && key && !c->itunes_metadata && !raw) { } else if (atom.size > 4 && key && !c->itunes_metadata && !raw) {
str_size = avio_rb16(pb); // string length str_size = avio_rb16(pb); // string length
if (str_size > atom.size) {
raw = 1;
avio_seek(pb, -2, SEEK_CUR);
goto retry;
}
langcode = avio_rb16(pb); langcode = avio_rb16(pb);
ff_mov_lang_to_iso639(langcode, language); ff_mov_lang_to_iso639(langcode, language);
atom.size -= 4; atom.size -= 4;