bilboed gst-plugins-good: gst-plugins-good/ gst-plugins-good/gst/qtdemux/

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-good
Changes by:     bilboed
Date:           Sun Dec 28 2008  09:50:46 UTC

Log message:
Patch by: j^ <j at oil21.org>
* gst/qtdemux/qtdemux.c: (qtdemux_video_caps),
(qtdemux_audio_caps):
Add codec mapping for xvid, fmp4 and ac3 tracks.
Fixes #565850

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

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.3874&r2=1.3875
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/qtdemux/qtdemux.c.diff?r1=1.239&r2=1.240

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v
retrieving revision 1.3874
retrieving revision 1.3875
diff -u -d -r1.3874 -r1.3875
--- ChangeLog	23 Dec 2008 12:10:34 -0000	1.3874
+++ ChangeLog	28 Dec 2008 09:50:29 -0000	1.3875
@@ -1,3 +1,12 @@
+2008-12-28  Edward Hervey  <[email protected]>
+
+	Patch by: j^ <j at oil21.org>
+	* gst/qtdemux/qtdemux.c: (qtdemux_video_caps),
+	(qtdemux_audio_caps):
+	Add codec mapping for xvid, fmp4 and ac3 tracks.
+	Fixes #565850
 2008-12-23  Wim Taymans  <[email protected]>
 
 	* ext/jpeg/gstsmokeenc.c: (gst_smokeenc_init),
Index: qtdemux.c
RCS file: /cvs/gstreamer/gst-plugins-good/gst/qtdemux/qtdemux.c,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -d -r1.239 -r1.240
--- qtdemux.c	25 Nov 2008 17:47:24 -0000	1.239
+++ qtdemux.c	28 Dec 2008 09:50:31 -0000	1.240
@@ -4749,6 +4749,20 @@
       caps = gst_caps_new_simple ("video/x-divx",
           "divxversion", G_TYPE_INT, 5, NULL);
       break;
+    case GST_MAKE_FOURCC ('X', 'V', 'I', 'D'):
+    case GST_MAKE_FOURCC ('x', 'v', 'i', 'd'):
+      _codec ("XVID MPEG-4");
+      caps = gst_caps_new_simple ("video/x-xvid", NULL);
+      break;
+    case GST_MAKE_FOURCC ('F', 'M', 'P', '4'):
+    case GST_MAKE_FOURCC ('U', 'M', 'P', '4'):
+      caps = gst_caps_new_simple ("video/mpeg",
+          "mpegversion", G_TYPE_INT, 4, NULL);
+      if (codec_name)
+        *codec_name = g_strdup ("FFmpeg MPEG-4");
     case GST_MAKE_FOURCC ('c', 'v', 'i', 'd'):
       _codec ("Cinepak");
       caps = gst_caps_new_simple ("video/x-cinepak", NULL);
@@ -4951,6 +4965,10 @@
       caps = gst_caps_new_simple ("audio/mpeg", "layer", G_TYPE_INT, 3,
           "mpegversion", G_TYPE_INT, 1, NULL);
+    case 0x20736d:
+      _codec ("AC-3 audio");
+      caps = gst_caps_new_simple ("audio/x-ac3", NULL);
     case GST_MAKE_FOURCC ('M', 'A', 'C', '3'):
       _codec ("MACE-3");
       caps = gst_caps_new_simple ("audio/x-mace",

------------------------------------------------------------------------------