[transmageddon] Commit local code to make sure remote is in sync as the code seems to work quite well now

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

commit 3e04310ca6489e6677c5d2c1dadccfd0ca179ebe
Author: Christian Fredrik Kalager Schaller <uraeus linuxrising org>
Date:   Fri Jan 31 13:00:57 2014 +0100

    Commit local code to make sure remote is in sync as the code seems to work quite well now

 src/transcoder_engine.py |    5 +----
 src/transmageddon.py     |    2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/src/transcoder_engine.py b/src/transcoder_engine.py
index 152ab51..0cf52b1 100644
--- a/src/transcoder_engine.py
+++ b/src/transcoder_engine.py
@@ -64,7 +64,6 @@ class Transcoder(GObject.GObject):
        self.probestreamid = False
        self.sinkpad = False
        self.usedstreamids = []
-       # self.remuxreturnvalue = True
 
        # switching width and height around for rotationchoices where it makes sense
        if int(self.videodata[0]['rotationvalue']) == 1 or int(self.videodata[0]['rotationvalue']) == 3:
@@ -118,7 +117,7 @@ class Transcoder(GObject.GObject):
                    self.colorspaceconverter = Gst.ElementFactory.make("videoconvert", None)
                    self.pipeline.add(self.colorspaceconverter)
 
-                   self.deinterlacer = Gst.ElementFactory.make('deinterlace', None)
+                   self.deinterlacer = Gst.ElementFactory.make('avdeinterlace', None)
                    self.pipeline.add(self.deinterlacer)
    
                    self.deinterlacer.link(self.colorspaceconverter)
@@ -178,8 +177,6 @@ class Transcoder(GObject.GObject):
        self.uridecoder.connect("pad-added", self.OnDynamicPad)
        self.uridecoder.connect('source-setup', self.dvdreadproperties)
 
-       #if (self.audiodata[0]['dopassthrough']) or (self.videodata[0]['dopassthrough']): # or 
(self.videodata[0]['outputvideocaps']=="novid"):
-       #    self.uridecoder.set_property("caps", self.remuxcaps) 
        self.uridecoder.set_state(Gst.State.PAUSED)
        self.pipeline.add(self.uridecoder)
        
diff --git a/src/transmageddon.py b/src/transmageddon.py
index f1f1443..09f2eed 100644
--- a/src/transmageddon.py
+++ b/src/transmageddon.py
@@ -110,7 +110,7 @@ supported_video_codecs = [
 supported_video_container_map = {
     'Ogg':        [ 'Theora', 'Dirac', 'On2 vp8' ],
     'MXF':        [ 'H264', 'MPEG2', 'MPEG4' ],
-    'Matroska':   [ 'Dirac', 'Theora', 'H264', 'On2 vp8',
+    'Matroska':   [ 'On2 vp8', 'Theora', 'H264', 'Dirac',
                     'MPEG4', 'MPEG2', 'H263+' ],
     'AVI':        [ 'H264', 'Dirac', 'MPEG2', 'MPEG4',
                     'Windows Media Video 2', 'On2 vp8' ],