diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-03-24 02:12:30 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-03-24 02:12:30 +0000 |
| commit | 6db4c473372a6fdc8388cdd3bc8da714575b2c05 (patch) | |
| tree | 1d9c2c02bd260549c1bff6a5b140d8a9c903f1b4 /gst-libs/gst | |
| parent | 2776854a435c8e30583f2be8a2106f5c15eb7035 (diff) | |
| download | gst-plugins-bad-6db4c473372a6fdc8388cdd3bc8da714575b2c05.tar.gz gst-plugins-bad-6db4c473372a6fdc8388cdd3bc8da714575b2c05.tar.bz2 gst-plugins-bad-6db4c473372a6fdc8388cdd3bc8da714575b2c05.zip | |
ext/alsa/gstalsa.h: Remove unused entry.
Original commit message from CVS:
* ext/alsa/gstalsa.h:
Remove unused entry.
* gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps):
Add cinepak.
* gst/videodrop/gstvideodrop.c: (gst_videodrop_getcaps),
(gst_videodrop_link), (gst_videodrop_chain):
Fix, sort of. Was horribly broken with new capsnego. Bah...
Diffstat (limited to 'gst-libs/gst')
| -rw-r--r-- | gst-libs/gst/riff/riff-media.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c index 042651a9..5e531997 100644 --- a/gst-libs/gst/riff/riff-media.c +++ b/gst-libs/gst/riff/riff-media.c @@ -201,6 +201,12 @@ gst_riff_create_video_caps (guint32 codec_fcc, *codec_name = g_strdup ("Windows Media Video 9"); break; + case GST_MAKE_FOURCC ('c', 'v', 'i', 'd'): + caps = gst_caps_new_simple ("video/x-cinepak", NULL); + if (codec_name) + *codec_name = g_strdup ("Cinepak video"); + break; + default: GST_WARNING ("Unkown video fourcc " GST_FOURCC_FORMAT, GST_FOURCC_ARGS (codec_fcc)); |