summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2007-09-25 05:03:58 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2007-09-25 05:03:58 +0000
commit94f68153dd1d739547aa500df65e6bb1aa112ced (patch)
treeabed70c782c66636e9560f0df8981a3d64198a09
parenta67ced8ff7e6a22c9db554e141648f5a7991a96b (diff)
gst/qtdemux/qtdemux.c: Add fourccs for MPEG2 HDV streams. Fixes #479960.
Original commit message from CVS: Patch by: <j at bootlab dot org> * gst/qtdemux/qtdemux.c: (qtdemux_video_caps): Add fourccs for MPEG2 HDV streams. Fixes #479960.
-rw-r--r--ChangeLog7
-rw-r--r--gst/qtdemux/qtdemux.c7
2 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 052c53e5..75665cf1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-25 Sebastian Dröge <slomo@circular-chaos.org>
+
+ Patch by: <j at bootlab dot org>
+
+ * gst/qtdemux/qtdemux.c: (qtdemux_video_caps):
+ Add fourccs for MPEG2 HDV streams. Fixes #479960.
+
2007-09-23 Stefan Kost <ensonic@users.sf.net>
* sys/oss/gstosshelper.c:
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index 6be21a90..92193f6f 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -3949,6 +3949,13 @@ qtdemux_video_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
caps = gst_caps_from_string ("video/mpeg, "
"systemstream = (boolean) false, " "mpegversion = (int) 1");
break;
+ case GST_MAKE_FOURCC ('h', 'd', 'v', '2'): // HDV 1080i60
+ case GST_MAKE_FOURCC ('h', 'd', 'v', '3'): // HDV 1080i50
+ case GST_MAKE_FOURCC ('m', 'x', '5', 'p'): // MPEG IMX 625/50 (50Mb/s)
+ _codec ("MPEG-2 video");
+ caps = gst_caps_from_string ("video/mpeg, "
+ "systemstream = (boolean) false, " "mpegversion = (int) 2");
+ break;
case GST_MAKE_FOURCC ('g', 'i', 'f', ' '):
_codec ("GIF still images");
caps = gst_caps_from_string ("image/gif");