[gst-cvs] ds gst-plugins: gst-plugins/ gst-plugins/gst/qtdemux/

[David S. <ds...@pd...>]

CVS Root:       /home/cvs/gstreamer
Module:         gst-plugins
Changes by:     ds
Date:           Sun Mar 07 2004  14:07:32 PST

Log message:
* gst/qtdemux/qtdemux.c: (qtdemux_video_caps):  Added Cinepak
format (bug #136470)

Modified files:
    .               : ChangeLog
    gst/qtdemux     : qtdemux.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ChangeLog.diff?r1=1.395&r2=1.396
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/qtdemux/qtdemux.c.diff?r1=1.45&r2=1.46

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /home/cvs/gstreamer/gst-plugins/ChangeLog,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -d -r1.395 -r1.396
--- a/ChangeLog	7 Mar 2004 20:51:10 -0000	1.395
+++ b/ChangeLog	7 Mar 2004 22:07:20 -0000	1.396
@@ -1,3 +1,8 @@
+2004-03-07  David Schleef  <ds...@sc...>
+
+	* 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:
Index: qtdemux.c
RCS file: /home/cvs/gstreamer/gst-plugins/gst/qtdemux/qtdemux.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- a/qtdemux.c	7 Mar 2004 04:03:27 -0000	1.45
+++ b/qtdemux.c	7 Mar 2004 22:07:20 -0000	1.46
@@ -1763,9 +1763,10 @@
           "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',' '):