summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-01-29 20:31:47 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-01-29 20:31:47 +0000
commit2ec0f8b91a4ad93524a1e6d9366a2a2eff15cbe7 (patch)
tree877e207df88b924574e526ed85edb142f1f91833
parentc17b9d42440fd68f4d1869784c4ff046743fa735 (diff)
downloadgst-plugins-bad-2ec0f8b91a4ad93524a1e6d9366a2a2eff15cbe7.tar.gz
gst-plugins-bad-2ec0f8b91a4ad93524a1e6d9366a2a2eff15cbe7.tar.bz2
gst-plugins-bad-2ec0f8b91a4ad93524a1e6d9366a2a2eff15cbe7.zip
gst/qtdemux/qtdemux.c: Add 3IV2 fourcc.
Original commit message from CVS: * gst/qtdemux/qtdemux.c: (qtdemux_video_caps): Add 3IV2 fourcc.
-rw-r--r--ChangeLog5
-rw-r--r--gst/qtdemux/qtdemux.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ca829dd..15e33aae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2005-01-29 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+ * gst/qtdemux/qtdemux.c: (qtdemux_video_caps):
+ Add 3IV2 fourcc.
+
+2005-01-29 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+
* gst/avi/gstavidemux.c: (gst_avi_demux_add_stream), (swap_line),
(gst_avi_demux_invert), (gst_avi_demux_process_next_entry),
(gst_avi_demux_stream_data):
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index b9ea73fe..4819a215 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -2692,6 +2692,7 @@ qtdemux_video_caps (GstQTDemux * qtdemux, guint32 fourcc,
return gst_caps_from_string ("video/mpeg, "
"mpegversion = (int) 4, " "systemstream = (boolean) false");
case GST_MAKE_FOURCC ('3', 'I', 'V', '1'):
+ case GST_MAKE_FOURCC ('3', 'I', 'V', '2'):
return gst_caps_from_string ("video/x-3ivx");
case GST_MAKE_FOURCC ('c', 'v', 'i', 'd'):
/* Cinepak */