[FFmpeg-cvslog] r24350 - in trunk/libavformat: asf.c asf.h
mstorsjo
subversion
Tue Jul 20 13:50:22 CEST 2010
Author: mstorsjo
Date: Tue Jul 20 13:50:22 2010
New Revision: 24350
Log:
asf: Add asf_jfif_media guid
Modified:
trunk/libavformat/asf.c
trunk/libavformat/asf.h
Modified: trunk/libavformat/asf.c
==============================================================================
--- trunk/libavformat/asf.c Tue Jul 20 12:19:35 2010 (r24349)
+++ trunk/libavformat/asf.c Tue Jul 20 13:50:22 2010 (r24350)
@@ -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
};
Modified: trunk/libavformat/asf.h
==============================================================================
--- trunk/libavformat/asf.h Tue Jul 20 12:19:35 2010 (r24349)
+++ trunk/libavformat/asf.h Tue Jul 20 13:50:22 2010 (r24350)
@@ -145,6 +145,7 @@ extern const ff_asf_guid ff_asf_audio_st
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;
More information about the ffmpeg-cvslog
mailing list