diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 11:18:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 11:18:20 +0200 |
| commit | c6b425896541c6cc0b58c1aceb8821333f4049bc (patch) | |
| tree | 9a97ed7e1222c52797213338b7120d8cf2bfbe43 | |
| parent | c6526620a9a802e89f92c7f3469a6adbb321970c (diff) | |
| parent | 1eb932803037a3c9f98f66aeb80024dfa3c5c743 (diff) | |
| download | ffmpeg-c6b425896541c6cc0b58c1aceb8821333f4049bc.tar.gz | |
Merge commit '1eb932803037a3c9f98f66aeb80024dfa3c5c743'
* commit '1eb932803037a3c9f98f66aeb80024dfa3c5c743':
asfenc: add ASF_Reserved_4 as defined in section 10.10 of the ASF spec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/asf.c | 4 | ||||
| -rw-r--r-- | libavformat/asf.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/asf.c b/libavformat/asf.c index dd64a3fbd0..80d24dbf43 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -117,6 +117,10 @@ const ff_asf_guid ff_asf_marker_header = { 0x01, 0xCD, 0x87, 0xF4, 0x51, 0xA9, 0xCF, 0x11, 0x8E, 0xE6, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65 }; +const ff_asf_guid ff_asf_reserved_4 = { + 0x20, 0xdb, 0xfe, 0x4c, 0xf6, 0x75, 0xCF, 0x11, 0x9c, 0x0f, 0x00, 0xa0, 0xc9, 0x03, 0x49, 0xcb +}; + /* I am not a number !!! This GUID is the one found on the PC used to * generate the stream */ const ff_asf_guid ff_asf_my_guid = { diff --git a/libavformat/asf.h b/libavformat/asf.h index 30d6c1e488..414baef11e 100644 --- a/libavformat/asf.h +++ b/libavformat/asf.h @@ -114,6 +114,7 @@ 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_reserved_4; extern const ff_asf_guid ff_asf_my_guid; extern const ff_asf_guid ff_asf_language_guid; extern const ff_asf_guid ff_asf_content_encryption; |