diff options
| author | Martin Storsjö <martin@martin.st> | 2010-07-20 11:50:22 +0000 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2010-07-20 11:50:22 +0000 |
| commit | 7428c8f599ca077fe1eea5925970aa2a70671c5d (patch) | |
| tree | 40be86b4745319db0645b031d3615d68503694f9 | |
| parent | c963e961ac7b40ef3117dc358138411705b5293a (diff) | |
asf: Add asf_jfif_media guid
Originally committed as revision 24350 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -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 e25ac030aa..58e17e9cef 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -55,6 +55,10 @@ const ff_asf_guid ff_asf_video_stream = { 0xC0, 0xEF, 0x19, 0xBC, 0x4D, 0x5B, 0xCF, 0x11, 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B }; +const ff_asf_guid ff_asf_jfif_media = { + 0x00, 0xE1, 0x1B, 0xB6, 0x4E, 0x5B, 0xCF, 0x11, 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B +}; + const ff_asf_guid ff_asf_video_conceal_none = { 0x00, 0x57, 0xFB, 0x20, 0x55, 0x5B, 0xCF, 0x11, 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B }; diff --git a/libavformat/asf.h b/libavformat/asf.h index 85e54ccfe9..0867755f46 100644 --- a/libavformat/asf.h +++ b/libavformat/asf.h @@ -145,6 +145,7 @@ extern const ff_asf_guid ff_asf_audio_stream; extern const ff_asf_guid ff_asf_audio_conceal_none; extern const ff_asf_guid ff_asf_audio_conceal_spread; extern const ff_asf_guid ff_asf_video_stream; +extern const ff_asf_guid ff_asf_jfif_media; extern const ff_asf_guid ff_asf_video_conceal_none; extern const ff_asf_guid ff_asf_command_stream; extern const ff_asf_guid ff_asf_comment_header; |