summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2005-11-21 16:45:46 +0000
committerTim-Philipp Müller <tim@centricular.net>2005-11-21 16:45:46 +0000
commit615eecd0f35a98fbbc002a4396358a11d26c6774 (patch)
tree7cc497c191c38cf50ac11e8de85b3006d9ba877f
parentee89b19c7a34aa7cf46abc31f773601938d50418 (diff)
downloadgst-plugins-bad-615eecd0f35a98fbbc002a4396358a11d26c6774.tar.gz
gst-plugins-bad-615eecd0f35a98fbbc002a4396358a11d26c6774.tar.bz2
gst-plugins-bad-615eecd0f35a98fbbc002a4396358a11d26c6774.zip
gst/qtdemux/qtdemux.c: j@bootlab.org, #321903).
Original commit message from CVS: * gst/qtdemux/qtdemux.c: (qtdemux_video_caps): Add DX50, DIVX and DIV3 fourccs (patch by j@bootlab.org, #321903).
-rw-r--r--ChangeLog6
-rw-r--r--gst/qtdemux/qtdemux.c10
2 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 16bc20bc..92ebc53c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-21 Tim-Philipp Müller <tim at centricular dot net>
+
+ * gst/qtdemux/qtdemux.c: (qtdemux_video_caps):
+ Add DX50, DIVX and DIV3 fourccs (patch by
+ j@bootlab.org, #321903).
+
2005-11-21 Andy Wingo <wingo@pobox.com>
* *.h:
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index 4a0c9d83..9a598554 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -2649,6 +2649,16 @@ qtdemux_video_caps (GstQTDemux * qtdemux, guint32 fourcc,
case GST_MAKE_FOURCC ('3', 'I', 'V', '2'):
_codec ("3ivX video");
return gst_caps_from_string ("video/x-3ivx");
+ case GST_MAKE_FOURCC ('D', 'I', 'V', '3'):
+ _codec ("DivX 3");
+ return gst_caps_from_string ("video/x-divx," "divxversion= (int) 3");
+ case GST_MAKE_FOURCC ('D', 'I', 'V', 'X'):
+ _codec ("DivX 4");
+ return gst_caps_from_string ("video/x-divx," "divxversion= (int) 4");
+
+ case GST_MAKE_FOURCC ('D', 'X', '5', '0'):
+ _codec ("DivX 5");
+ return gst_caps_from_string ("video/x-divx," "divxversion= (int) 5");
case GST_MAKE_FOURCC ('c', 'v', 'i', 'd'):
_codec ("Cinepak");
return gst_caps_from_string ("video/x-cinepak");