summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
authorj^ <j@bootlab.org>2008-05-02 09:09:58 +0000
committerWim Taymans <wim.taymans@gmail.com>2008-05-02 09:09:58 +0000
commit4f13f56ef96e7d98f458810c223fe30070d21e1b (patch)
tree28565278c704a2a301f83145eddc5dd79265e191 /gst
parent751f2bb3646f2beff3698c9f09900dbd0ea08abb (diff)
gst/qtdemux/qtdemux.c: Add more mpeg2 variants. Fixes #530886.
Original commit message from CVS: Patch by: j^ <j@bootlab.org> * gst/qtdemux/qtdemux.c: (qtdemux_video_caps): Add more mpeg2 variants. Fixes #530886.
Diffstat (limited to 'gst')
-rw-r--r--gst/qtdemux/qtdemux.c11
1 files changed, 10 insertions, 1 deletions
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");