summaryrefslogtreecommitdiff
path: root/gst
diff options
context:
space:
mode:
authorZhao Halley <halley.zhao@intel.com>2011-12-09 16:28:11 +0800
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>2012-01-16 11:40:51 +0100
commit650278347450731be998823d0ecdaf2df7015b5e (patch)
tree0b2813731d6094db399bb4e80f275c53cbad22ed /gst
parentc3455e341e6b441e5468ecd9356f7625cb685dce (diff)
Add initial MPEG-4 decoder.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Diffstat (limited to 'gst')
-rw-r--r--gst/vaapi/gstvaapidecode.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/gst/vaapi/gstvaapidecode.c b/gst/vaapi/gstvaapidecode.c
index 49fa80ea..43b43495 100644
--- a/gst/vaapi/gstvaapidecode.c
+++ b/gst/vaapi/gstvaapidecode.c
@@ -51,6 +51,7 @@
#endif
#if USE_CODEC_PARSERS
# include <gst/vaapi/gstvaapidecoder_mpeg2.h>
+# include <gst/vaapi/gstvaapidecoder_mpeg4.h>
# include <gst/vaapi/gstvaapidecoder_vc1.h>
#endif
@@ -315,9 +316,15 @@ gst_vaapidecode_create(GstVaapiDecode *decode, GstCaps *caps)
return FALSE;
if (version == 2)
decode->decoder = gst_vaapi_decoder_mpeg2_new(dpy, caps);
+ else if (version == 4)
+ decode->decoder = gst_vaapi_decoder_mpeg4_new(dpy, caps);
}
else if (gst_structure_has_name(structure, "video/x-wmv"))
decode->decoder = gst_vaapi_decoder_vc1_new(dpy, caps);
+ else if (gst_structure_has_name(structure, "video/x-h263") ||
+ gst_structure_has_name(structure, "video/x-divx") ||
+ gst_structure_has_name(structure, "video/x-xvid"))
+ decode->decoder = gst_vaapi_decoder_mpeg4_new(dpy, caps);
#endif
}
if (!decode->decoder)