From: Sebastian Dröge <sebastian.droege@collabora.co.uk>
Date: Fri, 27 May 2011 07:17:46 +0000 (+0200)
Subject: avimux: Revert 1a90a6c4 and drop Dirac support again
X-Git-Tag: 1.19.3~509^2~7136^2~514
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0a67d131b988e7db5192c6b808020424298dde8b;p=platform%2Fupstream%2Fgstreamer.git

avimux: Revert 1a90a6c4 and drop Dirac support again

It does not work at all (A/V sync issues), is not very useful,
other containers work much better with Dirac and Dirac in AVI
is not supported by other software.

Fixes bug #541215.
---

diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index fc8c986..c8be86b 100644
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -142,9 +142,6 @@ static GstStaticPadTemplate video_sink_factory =
         "video/x-huffyuv, "
         "width = (int) [ 16, 4096 ], "
         "height = (int) [ 16, 4096 ], " "framerate = (fraction) [ 0, MAX ];"
-        "video/x-dirac, "
-        "width = (int) [ 16, 4096 ], "
-        "height = (int) [ 16, 4096 ], " "framerate = (fraction) [ 0, MAX ];"
         "video/x-wmv, "
         "width = (int) [ 16, 4096 ], "
         "height = (int) [ 16, 4096 ], " "framerate = (fraction) [ 0, MAX ], "
@@ -600,8 +597,6 @@ gst_avi_mux_vidsink_set_caps (GstPad * pad, GstCaps * vscaps)
           avipad->vids.compression = GST_MAKE_FOURCC ('M', 'P', 'E', 'G');
           break;
       }
-    } else if (!strcmp (mimetype, "video/x-dirac")) {
-      avipad->vids.compression = GST_MAKE_FOURCC ('d', 'r', 'a', 'c');
     } else if (!strcmp (mimetype, "video/x-wmv")) {
       gint wmvversion;