diff options
| author | Michael Niedermayer | 2013-02-10 12:39:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer | 2013-02-10 12:39:17 +0100 |
| commit | 30085bd43e35acf931429dc445db5bc1869be022 (patch) | |
| tree | 9352c61c8f5aed1af80969f3eeb2fe2792e6759c /libavformat/asfdec.c | |
| parent | 3600049dae9ec886d6e0b8b3cb478357f6534865 (diff) | |
| parent | 84b721db366c0734fdfd23c8daaa7da7da21f761 (diff) | |
Merge commit '84b721db366c0734fdfd23c8daaa7da7da21f761'
* commit '84b721db366c0734fdfd23c8daaa7da7da21f761':
asfdec: also read Metadata Library Object
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/asfdec.c')
| -rw-r--r-- | libavformat/asfdec.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index 5b6f461d75..f748e8ba2a 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -132,6 +132,7 @@ static void print_guid(ff_asf_guid *g) else PRINT_IF_GUID(g, ff_asf_ext_stream_embed_stream_header); else PRINT_IF_GUID(g, ff_asf_ext_stream_audio_stream); else PRINT_IF_GUID(g, ff_asf_metadata_header); + else PRINT_IF_GUID(g, ff_asf_metadata_library_header); else PRINT_IF_GUID(g, ff_asf_marker_header); else PRINT_IF_GUID(g, stream_bitrate_guid); else PRINT_IF_GUID(g, ff_asf_language_guid); @@ -289,6 +290,9 @@ static void get_tag(AVFormatContext *s, const char *key, int type, int len, int } else if (type == 1 && !strcmp(key, "WM/Picture")) { // handle cover art asf_read_picture(s, len); goto finish; + } else if (type == 6) { // (don't) handle GUID + av_log(s, AV_LOG_DEBUG, "Unsupported GUID value in tag %s.\n", key); + goto finish; } else { av_log(s, AV_LOG_DEBUG, "Unsupported value type %d in tag %s.\n", type, key); @@ -744,6 +748,8 @@ static int asf_read_header(AVFormatContext *s) asf_read_ext_content_desc(s, gsize); } else if (!ff_guidcmp(&g, &ff_asf_metadata_header)) { asf_read_metadata(s, gsize); + } else if (!ff_guidcmp(&g, &ff_asf_metadata_library_header)) { + asf_read_metadata(s, gsize); } else if (!ff_guidcmp(&g, &ff_asf_ext_stream_header)) { asf_read_ext_stream_properties(s, gsize); |