[transmageddon] Re-add xvid as a codec option

[Christian Fredrik Kalager Schaller <uraeus src gnome org>]

commit daf9e2b4415ba5e2649d0a157da70aa230e1648f
Author: Christian Fredrik Kalager Schaller <uraeus linuxrising org>
Date:   Fri Jul 4 09:59:54 2014 +0200

    Re-add xvid as a codec option

 src/codecfinder.py   |    3 ++-
 src/transmageddon.py |    7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/src/codecfinder.py b/src/codecfinder.py
index c091381..d43939f 100644
--- a/src/codecfinder.py
+++ b/src/codecfinder.py
@@ -105,7 +105,8 @@ codecmap = { 'Vorbis' : "audio/x-vorbis", \
         'On2 vp9' : "video/x-vp9", \
         'mp2' : "audio/mpeg,mpegversion=(int)1, layer=(int)2", \
         'MPEG1' : "video/mpeg,mpegversion=(int)1,systemstream=false", \
-        'Opus'  :  "audio/x-opus" }
+        'Opus'  :  "audio/x-opus", \
+        'xvid'  :   "video/mpeg,mpegversion=4,systemstream=false,profile=advanced-simple" }
 
 #####
 #This code checks for available muxers and return a unique caps string
diff --git a/src/transmageddon.py b/src/transmageddon.py
index 06cf494..58cfe9c 100644
--- a/src/transmageddon.py
+++ b/src/transmageddon.py
@@ -99,7 +99,7 @@ supported_video_container_map = {
     'MXF':        [ 'H264', 'MPEG2', 'MPEG4' ],
     'Matroska':   [ 'On2 vp8', 'Theora', 'H264', 'Dirac', 'divx5',
                     'MPEG4', 'MPEG2', 'H263+' ],
-    'AVI':        [ 'H264', 'Dirac', 'MPEG2', 'MPEG4',
+    'AVI':        [ 'H264', 'Dirac', 'MPEG2', 'MPEG4', 'xvid',
                     'Windows Media Video 2', 'On2 vp8', 'divx5' ],
     'Quicktime':  [ 'H264', 'Dirac', 'MPEG2', 'MPEG4', 'On2 vp8' ],
     'MPEG4':      [ 'H264', 'MPEG2', 'MPEG4' ],
@@ -1130,7 +1130,10 @@ class TransmageddonUI(Gtk.ApplicationWindow):
                        self.videocodecs.append(Gst.caps_from_string(codecfinder.codecmap[c]))
                    for c in self.videocodecs: # Use descriptions from GStreamer
                        if c != "pass" and c != False:
-                           self.videorows[0].append_text(GstPbutils.pb_utils_get_codec_description(c))
+                           if c.to_string() == "video/mpeg, mpegversion=(int)4, systemstream=(boolean)false, 
profile=(string)advanced-simple":
+                               self.videorows[0].append_text("xvid")
+                           else:
+                               self.videorows[0].append_text(GstPbutils.pb_utils_get_codec_description(c))
                    self.videorows[0].set_sensitive(True)
                    self.videorows[0].set_active(0)