add VSSH (VideoSoft h264) and remove s323 (h323) from riff-lib because s323 is quickt...

Original commit message from CVS:
add VSSH (VideoSoft h264) and remove s323 (h323) from riff-lib
because s323 is quicktime specific

diff --git a/ChangeLog b/ChangeLog
index 0086c455efa0922eb5fa20be2bdcf672a35db877..d6e9ff103c3c3e587a3c1a4f7ee62a378736afec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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

diff --git a/gst-libs/gst/riff/riff-ids.h b/gst-libs/gst/riff/riff-ids.h
index 18bfb0fc43e332e857f7b6947c07d918627d6748..f6937dfd0f8b38114b12803299f8340c15c184fe 100644 (file)
--- a/gst-libs/gst/riff/riff-ids.h
+++ b/gst-libs/gst/riff/riff-ids.h
@@ -185,11 +185,11 @@
 #define GST_RIFF_WPY2 GST_MAKE_FOURCC ('W', 'P', 'Y', '2')
 #define GST_RIFF_m263 GST_MAKE_FOURCC ('m', '2', '6', '3')
 #define GST_RIFF_M263 GST_MAKE_FOURCC ('M', '2', '6', '3')
-#define GST_RIFF_s263 GST_MAKE_FOURCC ('s', '2', '6', '3')
 #define GST_RIFF_H263 GST_MAKE_FOURCC ('H', '2', '6', '3')
 #define GST_RIFF_i263 GST_MAKE_FOURCC ('i', '2', '6', '3')
 #define GST_RIFF_L263 GST_MAKE_FOURCC ('L', '2', '6', '3')
 #define GST_RIFF_x263 GST_MAKE_FOURCC ('x', '2', '6', '3')
+#define GST_RIFF_VSSH GST_MAKE_FOURCC ( 'V', 'S', 'S', 'H') /* H2.64 */
 
 #define GST_RIFF_Q1_0 GST_MAKE_FOURCC ('Q', '1',0x2e, '0')
 #define GST_RIFF_SFMC GST_MAKE_FOURCC ('S', 'F', 'M', 'C')

diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c
index 7714c077c2a6f6e1a7d9edf8f5c3621de82c4f1f..203187acffdaa6b90eebd667cce5ca4f1595f63d 100644 (file)
--- a/gst-libs/gst/riff/riff-media.c
+++ b/gst-libs/gst/riff/riff-media.c
@@ -142,12 +142,6 @@ gst_riff_create_video_caps_with_data (guint32 codec_fcc,
         *codec_name = g_strdup ("Microsoft H.263");
       break;
 
-    case GST_MAKE_FOURCC ('s', '2', '6', '3'):
-      caps = gst_caps_new_simple ("video/x-h263", NULL);
-      if (codec_name)
-        *codec_name = g_strdup ("3GPP H.263");
-      break;
-
     case GST_MAKE_FOURCC ('V', 'D', 'O', 'W'):
       caps = gst_caps_new_simple ("video/x-h263", NULL);
       if (codec_name)
@@ -166,6 +160,12 @@ gst_riff_create_video_caps_with_data (guint32 codec_fcc,
         *codec_name = g_strdup ("Xirlink H.263");
       break;
 
+    case GST_MAKE_FOURCC ('V', 'S', 'S', 'H'):
+      caps = gst_caps_new_simple ("video/x-h264", NULL);
+      if (codec_name)
+        *codec_name = g_strdup ("VideoSoft H.264");
+      break;
+
     case GST_MAKE_FOURCC ('D', 'I', 'V', '3'):
     case GST_MAKE_FOURCC ('d', 'i', 'v', '3'):
     case GST_MAKE_FOURCC ('D', 'I', 'V', '4'):