summaryrefslogtreecommitdiffstats
path: root/gst-libs/gst
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
commit403876e6373d91671dff69635d1701e040912489 (patch)
tree34e65585c41696608406f352a3a9cff6838cd88b /gst-libs/gst
parent82ccc32e940e47ac9129e25a48a0ca3537a82efc (diff)
downloadgst-plugins-bad-403876e6373d91671dff69635d1701e040912489.tar.gz
gst-plugins-bad-403876e6373d91671dff69635d1701e040912489.tar.bz2
gst-plugins-bad-403876e6373d91671dff69635d1701e040912489.zip
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
Diffstat (limited to 'gst-libs/gst')
-rw-r--r--gst-libs/gst/riff/riff-ids.h2
-rw-r--r--gst-libs/gst/riff/riff-media.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/gst-libs/gst/riff/riff-ids.h b/gst-libs/gst/riff/riff-ids.h
index 18bfb0fc..f6937dfd 100644
--- 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 7714c077..203187ac 100644
--- 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'):