From: Tim-Philipp Müller <tim@centricular.net>
Date: Sun, 2 Sep 2012 21:32:12 +0000 (+0100)
Subject: video/x-xvid -> video/mpeg,mpegversion=4
X-Git-Tag: 1.19.3~511^2~5969
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ba7d738d9e53b33907c607b8003014f7b5b0cb7f;p=platform%2Fupstream%2Fgstreamer.git

video/x-xvid -> video/mpeg,mpegversion=4
---

diff --git a/gst-libs/gst/pbutils/descriptions.c b/gst-libs/gst/pbutils/descriptions.c
index 55aa774..342f246 100644
--- a/gst-libs/gst/pbutils/descriptions.c
+++ b/gst-libs/gst/pbutils/descriptions.c
@@ -208,7 +208,6 @@ static const FormatInfo formats[] = {
   {"video/x-vp6-alpha", "On2 VP6 with alpha", 0},
   {"video/x-vp7", "On2 VP7", 0},
   {"video/x-vp8", "VP8", 0},
-  {"video/x-xvid", "XVID MPEG-4", 0},
   {"video/x-zlib", "Lossless zlib video", 0},
   {"video/x-zmbv", "Zip Motion Block video", 0},
 
diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c
index 9465c5e..8748dc3 100644
--- a/gst-libs/gst/riff/riff-media.c
+++ b/gst-libs/gst/riff/riff-media.c
@@ -407,19 +407,6 @@ gst_riff_create_video_caps (guint32 codec_fcc,
         *codec_name = g_strdup ("DivX MPEG-4 Version 5");
       break;
 
-    case GST_MAKE_FOURCC ('X', 'V', 'I', 'D'):
-    case GST_MAKE_FOURCC ('x', 'v', 'i', 'd'):
-      caps = gst_caps_new_empty_simple ("video/x-xvid");
-      if (codec_name)
-        *codec_name = g_strdup ("XVID MPEG-4");
-      break;
-
-    case GST_MAKE_FOURCC ('R', 'M', 'P', '4'):
-      caps = gst_caps_new_empty_simple ("video/x-xvid");
-      if (codec_name)
-        *codec_name = g_strdup ("Sigma-Designs MPEG-4");
-      break;
-
     case GST_MAKE_FOURCC ('M', 'P', 'G', '4'):
     case GST_MAKE_FOURCC ('M', 'P', '4', '1'):
     case GST_MAKE_FOURCC ('m', 'p', '4', '1'):
@@ -462,6 +449,8 @@ gst_riff_create_video_caps (guint32 codec_fcc,
         *codec_name = g_strdup ("FFmpeg MPEG-4");
       break;
 
+    case GST_MAKE_FOURCC ('X', 'V', 'I', 'D'):
+    case GST_MAKE_FOURCC ('x', 'v', 'i', 'd'):
     case GST_MAKE_FOURCC ('E', 'M', '4', 'A'):
     case GST_MAKE_FOURCC ('E', 'P', 'V', 'H'):
     case GST_MAKE_FOURCC ('F', 'V', 'F', 'W'):
@@ -478,6 +467,7 @@ gst_riff_create_video_caps (guint32 codec_fcc,
     case GST_MAKE_FOURCC ('G', 'E', 'O', 'X'):
     case GST_MAKE_FOURCC ('M', 'P', '4', 'V'):
     case GST_MAKE_FOURCC ('m', 'p', '4', 'v'):
+    case GST_MAKE_FOURCC ('R', 'M', 'P', '4'):
       caps = gst_caps_new_simple ("video/mpeg",
           "mpegversion", G_TYPE_INT, 4, NULL);
       if (codec_name)
diff --git a/tests/check/libs/pbutils.c b/tests/check/libs/pbutils.c
index 484efa2..888be16 100644
--- a/tests/check/libs/pbutils.c
+++ b/tests/check/libs/pbutils.c
@@ -275,7 +275,7 @@ static const gchar *caps_strings[] = {
   "video/x-smoke", "video/x-tarkin", "video/x-theora", "video/x-rle",
   "video/x-ultimotion", "video/x-vcd", "video/x-vmnc", "video/x-vp3",
   "video/x-vp5", "video/x-vp6", "video/x-vp6-flash", "video/x-vp7",
-  "video/x-xvid", "video/x-zlib", "image/bmp", "image/x-bmp",
+  "video/x-zlib", "image/bmp", "image/x-bmp",
   "image/x-MS-bmp", "image/gif", "image/jpeg", "image/jng", "image/png",
   "image/pbm", "image/ppm", "image/svg+xml", "image/tiff",
   "image/x-cmu-raster", "image/x-icon", "image/x-xcf", "image/x-pixmap",