From: Wim Taymans <wim.taymans@gmail.com>
Date: Sun, 19 Jan 2003 23:39:59 +0000 (+0000)
Subject: Fix codecs
X-Git-Tag: 1.19.3~499^2~2131
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee27cce6f303894a85cbf2dfd06d79b72d79887c;p=platform%2Fupstream%2Fgstreamer.git

Fix codecs

Original commit message from CVS:
Fix codecs
---

diff --git a/common b/common
index 895baa0..bbd74e9 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 895baa0fa0f829ef752424a31bbb2cf68e63842e
+Subproject commit bbd74e96ef37a7d437930f85f939a6a7d36dd012
diff --git a/ext/ffmpeg/gstffmpegallcodecmap.c b/ext/ffmpeg/gstffmpegallcodecmap.c
index e097284..f4490ab 100644
--- a/ext/ffmpeg/gstffmpegallcodecmap.c
+++ b/ext/ffmpeg/gstffmpegallcodecmap.c
@@ -514,15 +514,15 @@ gst_ffmpeg_caps_to_codecid (GstCaps        *caps,
         case GST_MAKE_FOURCC('x','2','6','3'):
           id = CODEC_ID_H263; /* or H263[IP] */
           break;
-        case GST_MAKE_FOURCC('D','I','V','X'):
         case GST_MAKE_FOURCC('d','i','v','x'):
         case GST_MAKE_FOURCC('D','I','V','3'):
         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('D','I','V','X'):
+        case GST_MAKE_FOURCC('D','X','5','0'):
         case GST_MAKE_FOURCC('X','V','I','D'):
           id = CODEC_ID_MPEG4;
           break;