diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gst/qtdemux/qtdemux.c | 11 |
2 files changed, 17 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2008-05-02 Wim Taymans <wim.taymans@collabora.co.uk> + + Patch by: j^ <j@bootlab.org> + + * gst/qtdemux/qtdemux.c: (qtdemux_video_caps): + Add more mpeg2 variants. Fixes #530886. + 2008-05-01 Tim-Philipp Müller <tim.muller at collabora co uk> Patch by: Youness Alaoui <youness.alaoui at collabora co uk> diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index c6adfe6d..655024db 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -4298,9 +4298,18 @@ 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', '1'): // HDV 720p30 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) + case GST_MAKE_FOURCC ('h', 'd', 'v', '5'): // HDV 720p25 + case GST_MAKE_FOURCC ('m', 'x', '5', 'n'): // MPEG2 IMX NTSC 525/60 50mb/s produced by FCP + case GST_MAKE_FOURCC ('m', 'x', '5', 'p'): // MPEG2 IMX PAL 625/60 50mb/s produced by FCP + case GST_MAKE_FOURCC ('m', 'x', '4', 'n'): // MPEG2 IMX NTSC 525/60 40mb/s produced by FCP + case GST_MAKE_FOURCC ('m', 'x', '4', 'p'): // MPEG2 IMX PAL 625/60 40mb/s produced by FCP + case GST_MAKE_FOURCC ('m', 'x', '3', 'n'): // MPEG2 IMX NTSC 525/60 30mb/s produced by FCP + 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 _codec ("MPEG-2 video"); caps = gst_caps_from_string ("video/mpeg, " "systemstream = (boolean) false, " "mpegversion = (int) 2"); |