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: Read the QT Metadata Keys only once

Browse Source 
If you have a file with multiple Metadata Keys, the second time you parse
the keys, you will re-alloc c->meta_keys without freeing the old one.
This change will avoid parsing all the consecutive Metadata keys.

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Thierry Foucu
2020-05-11 09:35:00 -07:00
committed by Michael Niedermayer
parent a7e1af3cb1
commit 1187cbf0ff
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/mov.c
View File

@@ -7026,7 +7026,8 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom)
// https://developer.apple.com/library/mac/documentation/QuickTime/QTFF/Metadata/Metadata.html // https://developer.apple.com/library/mac/documentation/QuickTime/QTFF/Metadata/Metadata.html
if (!parse && c->found_hdlr_mdta && if (!parse && c->found_hdlr_mdta &&
atom.type == MKTAG('m','e','t','a') && atom.type == MKTAG('m','e','t','a') &&
a.type == MKTAG('k','e','y','s')) { a.type == MKTAG('k','e','y','s') &&
c->meta_keys_count == 0) {
parse = mov_read_keys; parse = mov_read_keys;
} }