From ec536c8707ea0d54004f785dec75a78cf4183b4f Mon Sep 17 00:00:00 2001 From: j^ Date: Mon, 26 May 2008 16:25:15 +0000 Subject: [PATCH] gst/qtdemux/qtdemux.c: Add caps for DVCPRO50 and DVCPRO HD PAL/NTSC. See #526481. Original commit message from CVS: Patch by: j^ * gst/qtdemux/qtdemux.c: (qtdemux_video_caps): Add caps for DVCPRO50 and DVCPRO HD PAL/NTSC. See #526481. --- ChangeLog | 7 +++++++ gst/qtdemux/qtdemux.c | 18 +++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a342b60..2bad4d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2008-05-26 Wim Taymans + Patch by: j^ + + * gst/qtdemux/qtdemux.c: (qtdemux_video_caps): + Add caps for DVCPRO50 and DVCPRO HD PAL/NTSC. See #526481. + +2008-05-26 Wim Taymans + * 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 b521a57..5290fb1 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)"); -- 2.7.4