summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Moutte <julien@moutte.net>2008-11-25 17:47:24 +0000
committerJulien Moutte <julien@moutte.net>2008-11-25 17:47:24 +0000
commitde3590f54579f0bd28a26a187c82640a285ff10c (patch)
tree428284f6bc115c22f5c0c336041b0a58c80d1dbf
parentc25b0fcb9272712c67adc5d3855aa583b35c42d5 (diff)
gst/qtdemux/qtdemux.c: Add MPG1 and MPG2 fourcc to supported qtdemux video codecs as I found some video clips using t...
Original commit message from CVS: 2008-11-25 Julien Moutte <julien@fluendo.com> * gst/qtdemux/qtdemux.c: (qtdemux_video_caps): Add MPG1 and MPG2 fourcc to supported qtdemux video codecs as I found some video clips using those.
-rw-r--r--ChangeLog6
-rw-r--r--gst/qtdemux/qtdemux.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 60fe3198..4355bdd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-25 Julien Moutte <julien@fluendo.com>
+
+ * gst/qtdemux/qtdemux.c: (qtdemux_video_caps): Add MPG1 and MPG2 fourcc
+ to supported qtdemux video codecs as I found some video clips using
+ those.
+
2008-11-25 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/autodetect/gstautoaudiosink.c: (gst_auto_audio_sink_detect):
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index 40a3cfce..d1abd6fc 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -4682,6 +4682,7 @@ qtdemux_video_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
NULL);
break;
case GST_MAKE_FOURCC ('m', 'p', 'e', 'g'):
+ case GST_MAKE_FOURCC ('m', 'p', 'g', '1'):
_codec ("MPEG-1 video");
caps = gst_caps_new_simple ("video/mpeg", "mpegversion", G_TYPE_INT, 1,
"systemstream", G_TYPE_BOOLEAN, FALSE, NULL);
@@ -4699,6 +4700,7 @@ qtdemux_video_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
case GST_MAKE_FOURCC ('m', 'x', '3', 'p'): // MPEG2 IMX PAL 625/50 30mb/s produced by FCP
case GST_MAKE_FOURCC ('x', 'd', 'v', '2'): // XDCAM HD 1080i60
case GST_MAKE_FOURCC ('A', 'V', 'm', 'p'): // AVID IMX PAL
+ case GST_MAKE_FOURCC ('m', 'p', 'g', '2'): // AVID IMX PAL
_codec ("MPEG-2 video");
caps = gst_caps_new_simple ("video/mpeg", "mpegversion", G_TYPE_INT, 2,
"systemstream", G_TYPE_BOOLEAN, FALSE, NULL);