From: gb <gb@5584edef-b1fe-4b99-b61b-dd2bab72e969>
Date: Mon, 3 May 2010 17:36:01 +0000 (+0000)
Subject: Add more aliases for MPEG-4 decoding.
X-Git-Tag: 1.19.3~503^2~3459
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e39709453eaf208b40eae2064aa92923e8570ec0;p=platform%2Fupstream%2Fgstreamer.git

Add more aliases for MPEG-4 decoding.
---

diff --git a/gst-libs/gst/vaapi/gstvaapiprofile.c b/gst-libs/gst/vaapi/gstvaapiprofile.c
index 9fc294b..f41e96e 100644
--- a/gst-libs/gst/vaapi/gstvaapiprofile.c
+++ b/gst-libs/gst/vaapi/gstvaapiprofile.c
@@ -62,6 +62,12 @@ static const GstVaapiProfileMap gst_vaapi_profiles[] = {
     { GST_VAAPI_PROFILE_MPEG4_MAIN, VAProfileMPEG4Main,
       "video/mpeg, mpegversion=4", "main"
     },
+    { GST_VAAPI_PROFILE_MPEG4_ADVANCED_SIMPLE, VAProfileMPEG4AdvancedSimple,
+      "video/x-divx, divxversion=5", "advanced-simple"
+    },
+    { GST_VAAPI_PROFILE_MPEG4_ADVANCED_SIMPLE, VAProfileMPEG4AdvancedSimple,
+      "video/x-xvid", "advanced-simple"
+    },
 #if VA_CHECK_VERSION(0,30,0)
     { GST_VAAPI_PROFILE_H263_BASELINE, VAProfileH263Baseline,
       "video/x-h263, variant=itu, h263version=h263", "baseline"
diff --git a/gst/vaapidecode/gstvaapidecode.c b/gst/vaapidecode/gstvaapidecode.c
index ab29f42..82131b3 100644
--- a/gst/vaapidecode/gstvaapidecode.c
+++ b/gst/vaapidecode/gstvaapidecode.c
@@ -55,6 +55,8 @@ static const GstElementDetails gst_vaapidecode_details =
 static const char gst_vaapidecode_sink_caps_str[] =
     GST_CAPS_CODEC("video/mpeg, mpegversion=2")
     GST_CAPS_CODEC("video/mpeg, mpegversion=4")
+    GST_CAPS_CODEC("video/x-divx")
+    GST_CAPS_CODEC("video/x-xvid")
     GST_CAPS_CODEC("video/x-h263")
     GST_CAPS_CODEC("video/x-h264")
     GST_CAPS_CODEC("video/x-wmv")