gst/qtdemux/qtdemux.c: Add codec mapping for '2vuy' (Raw YUV produced by FCP) and...

Original commit message from CVS:
* gst/qtdemux/qtdemux.c: (qtdemux_video_caps):
Add codec mapping for '2vuy' (Raw YUV produced by FCP) and 'divx'.

diff --git a/ChangeLog b/ChangeLog
index ba17903dfa150fc7a2c401ba912c3322db615665..8571e0e858aea56fc0c5a19fe3541633a7e7cbff 100644 (file)
--- 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 5ecc515eb4283a59f36ae4918c4d0028f265720e..2d22b606856c00828c8de8c283ced5078d1e1ea2 100644 (file)
--- 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;