diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-10 12:39:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-10 12:39:17 +0100 |
| commit | 30085bd43e35acf931429dc445db5bc1869be022 (patch) | |
| tree | 9352c61c8f5aed1af80969f3eeb2fe2792e6759c /libavformat/asf.h | |
| 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/asf.h')
| -rw-r--r-- | libavformat/asf.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/asf.h b/libavformat/asf.h index 528d4c1773..5ffc7465a8 100644 --- a/libavformat/asf.h +++ b/libavformat/asf.h @@ -110,6 +110,7 @@ extern const ff_asf_guid ff_asf_simple_index_header; extern const ff_asf_guid ff_asf_ext_stream_embed_stream_header; extern const ff_asf_guid ff_asf_ext_stream_audio_stream; extern const ff_asf_guid ff_asf_metadata_header; +extern const ff_asf_guid ff_asf_metadata_library_header; extern const ff_asf_guid ff_asf_marker_header; extern const ff_asf_guid ff_asf_my_guid; extern const ff_asf_guid ff_asf_language_guid; |