diff -r 6b3c7c0b32ad -r 5224e0d6e2b9 gmyth-stream/server/plugins/transcoders/gmencoder.py
--- a/gmyth-stream/server/plugins/transcoders/gmencoder.py	Fri Aug 31 18:31:09 2007 +0100
+++ b/gmyth-stream/server/plugins/transcoders/gmencoder.py	Wed Nov 21 15:14:05 2007 +0000
@@ -46,14 +46,14 @@
         self._insert_param("-i", \
             "%s://%s" % (self.params_first("type", "file"),
                          self.params_first("uri", "")))
-        self._insert_param("--video-encode", self.params_first("ve", "ffenc_mpeg1video"))
-        self._insert_param("--video-opts", "bitrate=300000,pass=512,quantizer=0.01,quant-type=1")
-        #self._insert_param("--video-fps", self.params_first("fps", ""))
+        self._insert_param("--video-encode", self.params_first("ve", "theoraenc"))
+        self._insert_param("--video-opts", self.params_first ("video-opts", "quality=30,sharpness=2"))
         self._insert_param("--video-fps", self.params_first("fps", "10"))
-        self._insert_param("--video-width", self.params_first("width", "320"))
-        self._insert_param("--video-height", self.params_first("height", "240"))
-        self._insert_param("--audio-rate", "32000")
-        self._insert_param("--audio-encode", self.params_first("ae", ""))
+        self._insert_param("--video-width", self.params_first("width", "240"))
+        self._insert_param("--video-height", self.params_first("height", "144"))
+        self._insert_param("--audio-encode", self.params_first("ae", "vorbisenc"))
+        self._insert_param("--audio-opts", self.params_first ("audio-opts", "managed=true"))
+        self._insert_param("--mux-element", self.params_first("mux", "oggmux"))
     # _parse_params
 
     def start(self, outfd):
@@ -72,8 +72,8 @@
             self.proc = subprocess.Popen(self.opts, stdin=subprocess.PIPE,
                                          stdout=subprocess.PIPE)
 
-	    if outfile:
-           	outfd.write("OK   ")
+            if outfile:
+               outfd.write("OK   ")
 
         except Exception, e:
             self.log.error(self.tid, "Error: executing GMencoder: %s" % e)