From: Edward Hervey <bilboed@bilboed.com>
Date: Wed, 22 Feb 2006 09:33:25 +0000 (+0000)
Subject: gst/qtdemux/qtdemux.c: Add 'dvsd' and 'dv25' to list of possible fourcc values for... 
X-Git-Tag: RELEASE-0_10_3~240
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7eed67bb6b38180da07ca16e87ce4207cc93bc9d;p=platform%2Fupstream%2Fgst-plugins-good.git

gst/qtdemux/qtdemux.c: Add 'dvsd' and 'dv25' to list of possible fourcc values for DV Video.

Original commit message from CVS:
Reviewed by : Edward Hervey <edward@fluendo.com>
* gst/qtdemux/qtdemux.c: (qtdemux_video_caps):
Add 'dvsd' and 'dv25' to list of possible fourcc values for DV Video.
Add image/png for fourcc 'png '
---

diff --git a/common b/common
index c30611a..c09cd18 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit c30611ac38336030fed6d258c6e558cc537adbc5
+Subproject commit c09cd18d328f740ac532377fa5605b0f712cc6fd
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index df9f57b..b8e469c 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -3027,6 +3027,9 @@ qtdemux_video_caps (GstQTDemux * qtdemux, guint32 fourcc,
     const guint8 * stsd_data, const gchar ** codec_name)
 {
   switch (fourcc) {
+    case GST_MAKE_FOURCC ('p', 'n', 'g', ' '):
+      _codec ("PNG still images");
+      return gst_caps_from_string ("image/png");
     case GST_MAKE_FOURCC ('j', 'p', 'e', 'g'):
       _codec ("JPEG still images");
       return gst_caps_from_string ("image/jpeg");
@@ -3104,6 +3107,8 @@ qtdemux_video_caps (GstQTDemux * qtdemux, guint32 fourcc,
       return gst_caps_from_string ("video/x-indeo, indeoversion=(int)3");
     case GST_MAKE_FOURCC ('d', 'v', 'c', 'p'):
     case GST_MAKE_FOURCC ('d', 'v', 'c', ' '):
+    case GST_MAKE_FOURCC ('d', 'v', 's', 'd'):
+    case GST_MAKE_FOURCC ('d', 'v', '2', '5'):
       _codec ("DV Video");
       return gst_caps_from_string ("video/x-dv, systemstream=(boolean)false");
     case GST_MAKE_FOURCC ('s', 'm', 'c', ' '):