summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2004-03-07 22:07:20 +0000
committerDavid Schleef <ds@schleef.org>2004-03-07 22:07:20 +0000
commit834f9685a1b30010a48c709ad5e944710fc7bdc1 (patch)
tree1ed8061ef9901579f7a311b6fc7a8797d5972397
parent602f6e495dff943e916eeb8da99fa63896ad27e0 (diff)
downloadgst-plugins-bad-834f9685a1b30010a48c709ad5e944710fc7bdc1.tar.gz
gst-plugins-bad-834f9685a1b30010a48c709ad5e944710fc7bdc1.tar.bz2
gst-plugins-bad-834f9685a1b30010a48c709ad5e944710fc7bdc1.zip
gst/qtdemux/qtdemux.c: Added Cinepak format (bug #136470)
Original commit message from CVS: * gst/qtdemux/qtdemux.c: (qtdemux_video_caps): Added Cinepak format (bug #136470)
-rw-r--r--ChangeLog5
-rw-r--r--gst/qtdemux/qtdemux.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ec1d7eee..1145ad88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-07 David Schleef <ds@schleef.org>
+
+ * gst/qtdemux/qtdemux.c: (qtdemux_video_caps): Added Cinepak
+ format (bug #136470)
+
2004-03-07 Thomas Vander Stichele <thomas at apestaart dot org>
* gst-libs/Makefile.am:
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index 38267655..8da138a9 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -1763,9 +1763,10 @@ static GstCaps *qtdemux_video_caps(GstQTDemux *qtdemux, guint32 fourcc, const gu
"systemstream = (boolean) false");
case GST_MAKE_FOURCC('3','I','V','1'):
return gst_caps_from_string ("video/x-3ivx");
- case GST_MAKE_FOURCC('r','p','z','a'):
case GST_MAKE_FOURCC('c','v','i','d'):
/* Cinepak */
+ return gst_caps_from_string ("video/x-cinepak");
+ case GST_MAKE_FOURCC('r','p','z','a'):
case GST_MAKE_FOURCC('r','l','e',' '):
/* Run-length encoding */
case GST_MAKE_FOURCC('s','m','c',' '):