Map XVID to mpeg4

Original commit message from CVS:
Map XVID to mpeg4

diff --git a/common b/common
index 2a013c0..895baa0 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 2a013c06fe9bf1379966cd12e6bf8c30915c5f12
+Subproject commit 895baa0fa0f829ef752424a31bbb2cf68e63842e

diff --git a/ext/ffmpeg/gstffmpegallcodecmap.c b/ext/ffmpeg/gstffmpegallcodecmap.c
index 3a47db5..e097284 100644 (file)
--- a/ext/ffmpeg/gstffmpegallcodecmap.c
+++ b/ext/ffmpeg/gstffmpegallcodecmap.c
@@ -520,17 +520,18 @@ gst_ffmpeg_caps_to_codecid (GstCaps        *caps,
         case GST_MAKE_FOURCC('D','I','V','4'):
         case GST_MAKE_FOURCC('D','I','V','5'):
         case GST_MAKE_FOURCC('D','X','5','0'):
+        case GST_MAKE_FOURCC('M','P','4','3'):
           id = CODEC_ID_MSMPEG4V3;
           break;
+        case GST_MAKE_FOURCC('X','V','I','D'):
+          id = CODEC_ID_MPEG4;
+          break;
         case GST_MAKE_FOURCC('M','P','G','4'):
           id = CODEC_ID_MSMPEG4V1;
           break;
         case GST_MAKE_FOURCC('M','P','4','2'):
           id = CODEC_ID_MSMPEG4V2;
           break;
-        case GST_MAKE_FOURCC('M','P','4','3'):
-          id = CODEC_ID_MSMPEG4V3;
-          break;
         case GST_MAKE_FOURCC('W','M','V','1'):
           id = CODEC_ID_WMV1;
           break;