summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStéphane Loeuillet <gstreamer@leroutier.net>2004-12-13 12:11:57 +0000
committerStéphane Loeuillet <gstreamer@leroutier.net>2004-12-13 12:11:57 +0000
commit2a5d5ee9116ae8b790619cad084a8f01064d0a7f (patch)
tree98c9bffa2a329181cbf4fbf43f06942511047d61
parent77f52f294382414303d6a7dad2941b8ac1e79c99 (diff)
add VSSH (VideoSoft h264) and remove s323 (h323) from riff-lib because s323 is quicktime specific
Original commit message from CVS: add VSSH (VideoSoft h264) and remove s323 (h323) from riff-lib because s323 is quicktime specific
-rw-r--r--ChangeLog9
-rw-r--r--gst/wavenc/riff.h2
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0086c455..d6e9ff10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2004-12-13 Stephane Loeuillet <stephane.loeuillet@tiscali.fr>
+ * gst/wavenc/riff.h:
+ * gst-libs/gst/riff/riff-media.c:
+ * gst-libs/gst/riff/riff-ids.h:
+ add 4CC code for VideoSoft h264 in AVI (VSSH)
+ fixes bug #160655
+ remove s323 from riff, it's quicktime specific :(
+
+2004-12-13 Stephane Loeuillet <stephane.loeuillet@tiscali.fr>
+
* gst/asfdemux/README
* gst/wavenc/riff.h
* gst-libs/gst/riff/riff-ids.h
diff --git a/gst/wavenc/riff.h b/gst/wavenc/riff.h
index 962b638f..5ec30177 100644
--- a/gst/wavenc/riff.h
+++ b/gst/wavenc/riff.h
@@ -197,11 +197,11 @@ typedef enum {
#define GST_RIFF_WPY2 MAKE_FOUR_CC( 'W', 'P', 'Y', '2')
#define GST_RIFF_m263 MAKE_FOUR_CC( 'm', '2', '6', '3')
#define GST_RIFF_M263 MAKE_FOUR_CC( 'M', '2', '6', '3')
-#define GST_RIFF_s263 MAKE_FOUR_CC( 's', '2', '6', '3')
#define GST_RIFF_H263 MAKE_FOUR_CC( 'H', '2', '6', '3')
#define GST_RIFF_i263 MAKE_FOUR_CC( 'i', '2', '6', '3')
#define GST_RIFF_L263 MAKE_FOUR_CC( 'L', '2', '6', '3')
#define GST_RIFF_x263 MAKE_FOUR_CC( 'x', '2', '6', '3')
+#define GST_RIFF_VSSH MAKE_FOUR_CC( 'V', 'S', 'S', 'H') /* H2.64 */
#define GST_RIFF_Q1_0 MAKE_FOUR_CC( 'Q', '1',0x2e, '0')
#define GST_RIFF_SFMC MAKE_FOUR_CC( 'S', 'F', 'M', 'C')