summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--gst/qtdemux/qtdemux.c18
2 files changed, 24 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a342b603..2bad4d28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2008-05-26 Wim Taymans <wim.taymans@collabora.co.uk>
+ Patch by: j^ <j at oil21 dot org>
+
+ * gst/qtdemux/qtdemux.c: (qtdemux_video_caps):
+ Add caps for DVCPRO50 and DVCPRO HD PAL/NTSC. See #526481.
+
+2008-05-26 Wim Taymans <wim.taymans@collabora.co.uk>
+
* gst/audiofx/Makefile.am:
* gst/audiofx/audiofx.c: (plugin_init):
* gst/audiofx/audiovoice.c: (gst_audio_voice_base_init),
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index b521a573..5290fb13 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -4413,7 +4413,23 @@ qtdemux_video_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
case GST_MAKE_FOURCC ('d', 'v', '2', '5'):
case GST_MAKE_FOURCC ('d', 'v', 'p', 'p'):
_codec ("DV Video");
- caps = gst_caps_from_string ("video/x-dv, systemstream=(boolean)false");
+ caps =
+ gst_caps_from_string
+ ("video/x-dv, dvversion=(int)25, systemstream=(boolean)false");
+ break;
+ case GST_MAKE_FOURCC ('d', 'v', '5', 'n'): //DVCPRO50 NTSC
+ case GST_MAKE_FOURCC ('d', 'v', '5', 'p'): //DVCPRO50 PAL
+ _codec ("DVCPro50 Video");
+ caps =
+ gst_caps_from_string
+ ("video/x-dv, dvversion=(int)50, systemstream=(boolean)false");
+ break;
+ case GST_MAKE_FOURCC ('d', 'v', 'h', '5'): //DVCPRO HD 50i produced by FCP
+ case GST_MAKE_FOURCC ('d', 'v', 'h', '6'): //DVCPRO HD 60i produced by FCP
+ _codec ("DVCProHD Video");
+ caps =
+ gst_caps_from_string
+ ("video/x-dv, dvversion=(int)100, systemstream=(boolean)false");
break;
case GST_MAKE_FOURCC ('s', 'm', 'c', ' '):
_codec ("Apple Graphics (SMC)");