diff options
author | Arnaud Vrac <avrac@freebox.fr> | 2012-12-13 11:43:09 +0100 |
---|---|---|
committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-12-13 11:01:00 +0000 |
commit | 07c2a82e5d471794c03e89ca2e0dacd4ed544d23 (patch) | |
tree | 1ed137e5d55d76a4cbf64dc6001a4cec00bad237 /gst/videoparsers/gstmpeg4videoparse.c | |
parent | 1b11496194457f01187ea2313c7e8f7c8a113713 (diff) | |
download | gstreamer-plugins-bad-07c2a82e5d471794c03e89ca2e0dacd4ed544d23.tar.gz |
mpeg4videoparse: handle divx caps
DivX 4/5 are MPEG4 part 2 videos, so they can be parsed by this plugin.
Diffstat (limited to 'gst/videoparsers/gstmpeg4videoparse.c')
-rw-r--r-- | gst/videoparsers/gstmpeg4videoparse.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gst/videoparsers/gstmpeg4videoparse.c b/gst/videoparsers/gstmpeg4videoparse.c index 0b10e31db..92bfd29f9 100644 --- a/gst/videoparsers/gstmpeg4videoparse.c +++ b/gst/videoparsers/gstmpeg4videoparse.c @@ -46,14 +46,16 @@ GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, "width = (int)[ 0, max ], " "height = (int)[ 0, max ], " "framerate = (fraction)[ 0, max ] ," - "parsed = (boolean) true, " "systemstream = (boolean) false") + "parsed = (boolean) true, " "systemstream = (boolean) false; " + "video/x-divx, " "divxversion = (int) [ 4, 5 ]") ); static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS ("video/mpeg, " - "mpegversion = (int) 4, " "systemstream = (boolean) false") + "mpegversion = (int) 4, " "systemstream = (boolean) false; " + "video/x-divx, " "divxversion = (int) [ 4, 5 ]") ); /* Properties */ @@ -570,11 +572,11 @@ gst_mpeg4vparse_update_src_caps (GstMpeg4VParse * mp4vparse) s = gst_caps_get_structure (caps, 0); } else { caps = gst_caps_new_simple ("video/mpeg", - "mpegversion", G_TYPE_INT, 4, NULL); + "mpegversion", G_TYPE_INT, 4, + "systemstream", G_TYPE_BOOLEAN, FALSE, NULL); } - gst_caps_set_simple (caps, "systemstream", G_TYPE_BOOLEAN, FALSE, - "parsed", G_TYPE_BOOLEAN, TRUE, NULL); + gst_caps_set_simple (caps, "parsed", G_TYPE_BOOLEAN, TRUE, NULL); if (mp4vparse->profile && mp4vparse->level) { gst_caps_set_simple (caps, "profile", G_TYPE_STRING, mp4vparse->profile, |