summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2007-07-24 14:31:56 +0000
committerEdward Hervey <bilboed@bilboed.com>2007-07-24 14:31:56 +0000
commit8e316c0023cf3a776c93c9b731c0cad6322aafb6 (patch)
tree301729255ff95cf1d1b7de93d3109aed57ca9703
parent425eb1c601fc2f4b25f054f9fe5caaf82e8dec19 (diff)
gst/qtdemux/qtdemux.c: Add codec mapping for '2vuy' (Raw YUV produced by FCP) and 'divx'.
Original commit message from CVS: * gst/qtdemux/qtdemux.c: (qtdemux_video_caps): Add codec mapping for '2vuy' (Raw YUV produced by FCP) and 'divx'.
-rw-r--r--ChangeLog5
-rw-r--r--gst/qtdemux/qtdemux.c6
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ba17903d..8571e0e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-24 Edward Hervey <bilboed@bilboed.com>
+
+ * gst/qtdemux/qtdemux.c: (qtdemux_video_caps):
+ Add codec mapping for '2vuy' (Raw YUV produced by FCP) and 'divx'.
+
2007-07-24 Sebastian Dröge <slomo@circular-chaos.org>
* ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_chain):
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index 5ecc515e..2d22b606 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -3925,6 +3925,11 @@ qtdemux_video_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
caps = gst_caps_from_string ("video/x-raw-yuv, "
"format = (fourcc) YUY2");
break;
+ case GST_MAKE_FOURCC ('2', 'v', 'u', 'y'):
+ _codec ("Raw packed YUV 4:2:0");
+ caps = gst_caps_from_string ("video/x-raw-yuv, "
+ "format = (fourcc) UYVY");
+ break;
case GST_MAKE_FOURCC ('m', 'p', 'e', 'g'):
_codec ("MPEG-1 video");
caps = gst_caps_from_string ("video/mpeg, "
@@ -3962,6 +3967,7 @@ qtdemux_video_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
caps = gst_caps_from_string ("video/x-divx," "divxversion= (int) 3");
break;
case GST_MAKE_FOURCC ('D', 'I', 'V', 'X'):
+ case GST_MAKE_FOURCC ('d', 'i', 'v', 'x'):
_codec ("DivX 4");
caps = gst_caps_from_string ("video/x-divx," "divxversion= (int) 4");
break;