From 9bf90f47cf789876c91d807bc70866f23875d3a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Mon, 3 Sep 2012 02:51:24 +0100
Subject: [PATCH] video/x-xvid -> video/mpeg,mpegversion=4

---
 gst/avi/gstavimux.c           |  4 ----
 gst/matroska/matroska-demux.c |  8 --------
 gst/matroska/matroska-mux.c   | 11 +++--------
 gst/rtp/gstrtpmp4vpay.c       |  3 +--
 tests/check/elements/avimux.c |  3 ++-
 5 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index cc18dc50ad..79e24c9ade 100644
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -106,10 +106,6 @@ static GstStaticPadTemplate video_sink_factory =
         "height = (int) [ 16, 4096 ], "
         "framerate = (fraction) [ 0, MAX ], "
         "divxversion = (int) [ 3, 5 ]; "
-        "video/x-xvid, "
-        "width = (int) [ 16, 4096 ], "
-        "height = (int) [ 16, 4096 ], "
-        "framerate = (fraction) [ 0, MAX ]; "
         "video/x-3ivx, "
         "width = (int) [ 16, 4096 ], "
         "height = (int) [ 16, 4096 ], "
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index fbca729c6e..819c97fbb1 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -5030,14 +5030,6 @@ gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext *
     *codec_name = g_strdup ("MPEG-4 simple profile");
   } else if (!strcmp (codec_id, GST_MATROSKA_CODEC_ID_VIDEO_MPEG4_ASP) ||
       !strcmp (codec_id, GST_MATROSKA_CODEC_ID_VIDEO_MPEG4_AP)) {
-#if 0
-    caps = gst_caps_new_full (gst_structure_new ("video/x-divx",
-            "divxversion", G_TYPE_INT, 5, NULL),
-        gst_structure_new ("video/x-xvid", NULL),
-        gst_structure_new ("video/mpeg",
-            "mpegversion", G_TYPE_INT, 4,
-            "systemstream", G_TYPE_BOOLEAN, FALSE, NULL), NULL);
-#endif
     caps = gst_caps_new_simple ("video/mpeg",
         "mpegversion", G_TYPE_INT, 4,
         "systemstream", G_TYPE_BOOLEAN, FALSE, NULL);
diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c
index c8a74148c7..d080405dad 100644
--- a/gst/matroska/matroska-mux.c
+++ b/gst/matroska/matroska-mux.c
@@ -110,8 +110,6 @@ static GstStaticPadTemplate videosink_templ =
         COMMON_VIDEO_CAPS "; "
         "video/x-divx, "
         COMMON_VIDEO_CAPS "; "
-        "video/x-xvid, "
-        COMMON_VIDEO_CAPS "; "
         "video/x-huffyuv, "
         COMMON_VIDEO_CAPS "; "
         "video/x-dv, "
@@ -994,9 +992,8 @@ skip_details:
       videocontext->fourcc = GST_STR_FOURCC (fstr);
   } else if (!strcmp (mimetype, "image/jpeg")) {
     gst_matroska_mux_set_codec_id (context, GST_MATROSKA_CODEC_ID_VIDEO_MJPEG);
-  } else if (!strcmp (mimetype, "video/x-xvid") /* MS/VfW compatibility cases */
-      ||!strcmp (mimetype, "video/x-huffyuv")
-      || !strcmp (mimetype, "video/x-divx")
+  } else if (!strcmp (mimetype, "video/x-huffyuv")      /* MS/VfW compatibility cases */
+      ||!strcmp (mimetype, "video/x-divx")
       || !strcmp (mimetype, "video/x-dv")
       || !strcmp (mimetype, "video/x-h263")
       || !strcmp (mimetype, "video/x-msmpeg")
@@ -1006,9 +1003,7 @@ skip_details:
     gint size = sizeof (gst_riff_strf_vids);
     guint32 fourcc = 0;
 
-    if (!strcmp (mimetype, "video/x-xvid"))
-      fourcc = GST_MAKE_FOURCC ('X', 'V', 'I', 'D');
-    else if (!strcmp (mimetype, "video/x-huffyuv"))
+    if (!strcmp (mimetype, "video/x-huffyuv"))
       fourcc = GST_MAKE_FOURCC ('H', 'F', 'Y', 'U');
     else if (!strcmp (mimetype, "video/x-dv"))
       fourcc = GST_MAKE_FOURCC ('D', 'V', 'S', 'D');
diff --git a/gst/rtp/gstrtpmp4vpay.c b/gst/rtp/gstrtpmp4vpay.c
index 3e84831303..6b91a434df 100644
--- a/gst/rtp/gstrtpmp4vpay.c
+++ b/gst/rtp/gstrtpmp4vpay.c
@@ -35,8 +35,7 @@ static GstStaticPadTemplate gst_rtp_mp4v_pay_sink_template =
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("video/mpeg,"
-        "mpegversion=(int) 4," "systemstream=(boolean)false;"
-        "video/x-xvid; video/x-divx")
+        "mpegversion=(int) 4, systemstream=(boolean)false;" "video/x-divx")
     );
 
 static GstStaticPadTemplate gst_rtp_mp4v_pay_src_template =
diff --git a/tests/check/elements/avimux.c b/tests/check/elements/avimux.c
index c9399f0734..77441258f9 100644
--- a/tests/check/elements/avimux.c
+++ b/tests/check/elements/avimux.c
@@ -32,7 +32,8 @@ static GstPad *mysrcpad, *mysinkpad;
 #define AUDIO_CAPS_STRING "audio/x-ac3, " \
                         "channels = (int) 1, " \
                         "rate = (int) 8000"
-#define VIDEO_CAPS_STRING "video/x-xvid, " \
+#define VIDEO_CAPS_STRING "video/mpeg, mpegversion = (int) 4, " \
+                           "systemstream = (bool) false, " \
                            "width = (int) 384, " \
                            "height = (int) 288, " \
                            "framerate = (fraction) 25/1"