1.1 --- a/gmyth-stream/server/0.3/plugins/transcoders/mencoder.py Fri Jun 01 17:12:35 2007 +0100
1.2 +++ b/gmyth-stream/server/0.3/plugins/transcoders/mencoder.py Mon Jun 04 12:30:07 2007 +0100
1.3 @@ -185,7 +185,10 @@
1.4 self._setup_filename()
1.5 self._setup_mencoder_opts(self.mencoder_opts)
1.6 except Exception, e:
1.7 - self.log.error(self.tid, "Error: %s" % e)
1.8 + if self.log:
1.9 + self.log.error(self.tid, "Error: %s" % e)
1.10 + else:
1.11 + raise
1.12 # __init__()
1.13
1.14
1.15 @@ -257,7 +260,7 @@
1.16 if not self._run_mencoder(output=subprocess.PIPE):
1.17 return False
1.18
1.19 - if not self.params_first("multicast", None):
1.20 + if not self.params_first("multicast", False):
1.21 try:
1.22 while self.proc and self.proc.poll() == None:
1.23 d = self.proc.stdout.read(1024)