From: Ronald S. Bultje <rbultje@ronald.bitfreak.net>
Date: Sat, 25 Jan 2003 13:55:27 +0000 (+0000)
Subject: Add xvid
X-Git-Tag: 1.19.3~499^2~2129
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=17f2e68a7b5b9ac428aae595eda6b341fc3cf287;p=platform%2Fupstream%2Fgstreamer.git

Add xvid

Original commit message from CVS:
Add xvid
---

diff --git a/ext/ffmpeg/gstffmpegall.c b/ext/ffmpeg/gstffmpegall.c
index 54aabad..1fda70f 100644
--- a/ext/ffmpeg/gstffmpegall.c
+++ b/ext/ffmpeg/gstffmpegall.c
@@ -136,6 +136,8 @@ GST_PAD_TEMPLATE_FACTORY(sink_templ,
                         GST_PROPS_FOURCC (GST_MAKE_FOURCC('D','I','V','4')),
                         GST_PROPS_FOURCC (GST_MAKE_FOURCC('D','I','V','5')),
                         GST_PROPS_FOURCC (GST_MAKE_FOURCC('D','X','5','o')),
+                        GST_PROPS_FOURCC (GST_MAKE_FOURCC('X','V','I','D')),
+                        GST_PROPS_FOURCC (GST_MAKE_FOURCC('x','v','i','d')),
                         GST_PROPS_FOURCC (GST_MAKE_FOURCC('M','P','G','4')),
                         GST_PROPS_FOURCC (GST_MAKE_FOURCC('M','P','4','2')),
                         GST_PROPS_FOURCC (GST_MAKE_FOURCC('M','P','4','3')),
diff --git a/ext/ffmpeg/gstffmpegallcodecmap.c b/ext/ffmpeg/gstffmpegallcodecmap.c
index f4490ab..e1d02a8 100644
--- a/ext/ffmpeg/gstffmpegallcodecmap.c
+++ b/ext/ffmpeg/gstffmpegallcodecmap.c
@@ -524,6 +524,7 @@ gst_ffmpeg_caps_to_codecid (GstCaps        *caps,
         case GST_MAKE_FOURCC('D','I','V','X'):
         case GST_MAKE_FOURCC('D','X','5','0'):
         case GST_MAKE_FOURCC('X','V','I','D'):
+        case GST_MAKE_FOURCC('x','v','i','d'):
           id = CODEC_ID_MPEG4;
           break;
         case GST_MAKE_FOURCC('M','P','G','4'):