From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 6 Jun 2014 14:16:27 +0000 (+0200)
Subject: Revert "avcodecmap: do more reverse mapping of MPEG4"
X-Git-Tag: 1.3.3~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd7ba73304377e2e52580176d1da53e0e2b70541;p=platform%2Fupstream%2Fgst-libav.git

Revert "avcodecmap: do more reverse mapping of MPEG4"

This reverts commit e066785ad05f9119e3c1eded46260bcabd556b4d.

x-xvid and x-3ivx are removed, we don't want to expose them again.
---

diff --git a/ext/libav/gstavcodecmap.c b/ext/libav/gstavcodecmap.c
index 8a9c0ba..6ef0af1 100644
--- a/ext/libav/gstavcodecmap.c
+++ b/ext/libav/gstavcodecmap.c
@@ -976,16 +976,6 @@ gst_ffmpeg_codecid_to_caps (enum AVCodecID codec_id,
                 gst_ff_vid_caps_new (context, NULL, codec_id, encode,
                 "video/x-divx", "divxversion", G_TYPE_INT, 5, NULL);
             break;
-          case GST_MAKE_FOURCC ('X', 'V', 'I', 'D'):
-            caps =
-                gst_ff_vid_caps_new (context, NULL, codec_id, encode,
-                "video/x-xvid", NULL);
-            break;
-          case GST_MAKE_FOURCC ('3', 'I', 'V', '1'):
-            caps =
-                gst_ff_vid_caps_new (context, NULL, codec_id, encode,
-                "video/x-3ivx", NULL);
-            break;
           case GST_MAKE_FOURCC ('m', 'p', '4', 'v'):
           default:
             /* FIXME: bitrate */