[Telepathy-commits] [mingle/master] Add ability to do theora

[Sjoerd Simons]

---
 fs2.py |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/fs2.py b/fs2.py
index ae762f8..6241dad 100644
--- a/fs2.py
+++ b/fs2.py
@@ -55,11 +55,11 @@ MYCNAME = "".join((pwd.getpwuid(os.getuid())[0],
                    "@",
                    socket.gethostname()))
 
-CODECS = { farsight.MEDIA_TYPE_VIDEO: [ "H264", "H263-1998", "H263" ],
+CODECS = { farsight.MEDIA_TYPE_VIDEO: [ "H264", "H263-1998",
+                "H263", "THEORA" ],
            farsight.MEDIA_TYPE_AUDIO: [ "SPEEX", "PCMA", "PCMU" ]
 }
 
-
 def make_video_sink(pipeline, xid, name, async=True):
     "Make a bin with a video sink in it, that will be displayed on xid."
     bin = gst.Bin("videosink_%d" % xid)
@@ -190,8 +190,6 @@ class ConferenceSession:
 
         if type == farsight.MEDIA_TYPE_VIDEO:
            codecs.append(farsight.Codec(farsight.CODEC_ID_DISABLE,
-            "THEORA", farsight.MEDIA_TYPE_VIDEO, 0))
-           codecs.append(farsight.Codec(farsight.CODEC_ID_DISABLE,
             "DV", farsight.MEDIA_TYPE_VIDEO, 0))
            codecs.append(farsight.Codec(farsight.CODEC_ID_DISABLE,
             "MPV", farsight.MEDIA_TYPE_VIDEO, 0))
-- 
1.5.6.5