summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Vrac <avrac@freebox.fr>2012-12-13 11:43:09 +0100
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2012-12-13 11:02:25 +0000
commitac97f9c8864f9bbf3d4663d23eedbf047893184b (patch)
tree52be655d3fffbd50f442c71ef95f347dd4ade4e4
parent3ed4b12c47b7645cc71c5159b77191e534ccba80 (diff)
downloadgstreamer-plugins-bad-ac97f9c8864f9bbf3d4663d23eedbf047893184b.tar.gz
mpeg4videoparse: handle divx caps
DivX 4/5 are MPEG4 part 2 videos, so they can be parsed by this plugin.
-rw-r--r--gst/videoparsers/gstmpeg4videoparse.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/gst/videoparsers/gstmpeg4videoparse.c b/gst/videoparsers/gstmpeg4videoparse.c
index d8c5b8339..cf6beeaa7 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,