diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-10 15:39:12 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-10 15:39:17 +0400 |
commit | 30085bd43e35acf931429dc445db5bc1869be022 (patch) | |
tree | 9352c61c8f5aed1af80969f3eeb2fe2792e6759c /libavformat/asf.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/asf.c')
-rw-r--r-- | libavformat/asf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/asf.c b/libavformat/asf.c index d92fbd66e0..dd64a3fbd0 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -109,6 +109,10 @@ const ff_asf_guid ff_asf_metadata_header = { 0xea, 0xcb, 0xf8, 0xc5, 0xaf, 0x5b, 0x77, 0x48, 0x84, 0x67, 0xaa, 0x8c, 0x44, 0xfa, 0x4c, 0xca }; +const ff_asf_guid ff_asf_metadata_library_header = { + 0x94, 0x1c, 0x23, 0x44, 0x98, 0x94, 0xd1, 0x49, 0xa1, 0x41, 0x1d, 0x13, 0x4e, 0x45, 0x70, 0x54 +}; + const ff_asf_guid ff_asf_marker_header = { 0x01, 0xCD, 0x87, 0xF4, 0x51, 0xA9, 0xCF, 0x11, 0x8E, 0xE6, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65 }; |