summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2006-02-22 09:33:25 +0000
committerEdward Hervey <bilboed@bilboed.com>2006-02-22 09:33:25 +0000
commit091e9393442ac1fa9e4d200321b6740ea6dd6331 (patch)
tree717ee1de9b1544475954e8aa23e695d1566c447c
parent231e251d949f8ef862113eca324039c8aeeda648 (diff)
downloadgst-plugins-bad-091e9393442ac1fa9e4d200321b6740ea6dd6331.tar.gz
gst-plugins-bad-091e9393442ac1fa9e4d200321b6740ea6dd6331.tar.bz2
gst-plugins-bad-091e9393442ac1fa9e4d200321b6740ea6dd6331.zip
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 '
-rw-r--r--ChangeLog8
-rw-r--r--gst/qtdemux/qtdemux.c5
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 575543f8..c79f786c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-02-19 Jan Gerber <j@bootlab.org>
+
+ 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 '
+
2006-02-21 Tim-Philipp Müller <tim at centricular dot net>
* configure.ac:
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index df9f57b7..b8e469c2 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', ' '):