diff options
| author | Stéphane Loeuillet <gstreamer@leroutier.net> | 2004-12-13 00:47:20 +0000 |
|---|---|---|
| committer | Stéphane Loeuillet <gstreamer@leroutier.net> | 2004-12-13 00:47:20 +0000 |
| commit | fc108fdf7c2b09e84a711ecd0909276d02bf711d (patch) | |
| tree | f96a8f81591a77b2b2f8f5110f6d59d2c1712cb2 | |
| parent | f46ec4e3b75d8e5c17b877c6c4d5d07898d3742b (diff) | |
| download | gst-plugins-bad-fc108fdf7c2b09e84a711ecd0909276d02bf711d.tar.gz gst-plugins-bad-fc108fdf7c2b09e84a711ecd0909276d02bf711d.tar.bz2 gst-plugins-bad-fc108fdf7c2b09e84a711ecd0909276d02bf711d.zip | |
gst/asfdemux/README gst/wavenc/riff.h gst-libs/gst/riff/riff-ids.h gst-libs/gst/riff/riff-media.c add new 4CC codes f...
Original commit message from CVS:
* gst/asfdemux/README
* gst/wavenc/riff.h
* gst-libs/gst/riff/riff-ids.h
* gst-libs/gst/riff/riff-media.c
add new 4CC codes for h263 related codecs
fixes partially bug #155163
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gst-libs/gst/riff/riff-ids.h | 5 | ||||
| -rw-r--r-- | gst-libs/gst/riff/riff-media.c | 7 |
3 files changed, 21 insertions, 0 deletions
@@ -1,3 +1,12 @@ +2004-12-13 Stephane Loeuillet <stephane.loeuillet@tiscali.fr> + + * gst/asfdemux/README + * gst/wavenc/riff.h + * gst-libs/gst/riff/riff-ids.h + * gst-libs/gst/riff/riff-media.c + add new 4CC codes for h263 related codecs + fixes partially bug #155163 + 2004-12-12 Christian Fredrik Kalager Schaller <christian at fluendo dot com> * configure.ac: Update polyaudio requirement to 0.7 diff --git a/gst-libs/gst/riff/riff-ids.h b/gst-libs/gst/riff/riff-ids.h index 2684e6c3..18bfb0fc 100644 --- a/gst-libs/gst/riff/riff-ids.h +++ b/gst-libs/gst/riff/riff-ids.h @@ -185,6 +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_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 4e4e22d3..7714c077 100644 --- a/gst-libs/gst/riff/riff-media.c +++ b/gst-libs/gst/riff/riff-media.c @@ -136,11 +136,18 @@ gst_riff_create_video_caps_with_data (guint32 codec_fcc, break; case GST_MAKE_FOURCC ('M', '2', '6', '3'): + case GST_MAKE_FOURCC ('m', '2', '6', '3'): caps = gst_caps_new_simple ("video/x-h263", NULL); if (codec_name) *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) |