Automated merge with http://delx.net.au/hg/transcoding

diff --git a/encode.py b/encode.py
index f56eb545e86aa3d3e2be0ca548e4c5b54ee5dd38..2cc7d00006f1a189d2998fdeaf58f7fb90c53fe3 100755 (executable)
--- a/encode.py
+++ b/encode.py
@@ -20,13 +20,15 @@ class MencoderCommand(object):
                        if var is not None:
                                cmd.append(opt)
                                cmd.append(var)
+               if self.opts.deinterlace:
+                       cmd += ["-vf-add", "pp=ci"]
                tryOpt("-ss", self.opts.startpos)
                tryOpt("-endpos", self.opts.endpos)
                tryOpt("-dvd-device", self.opts.dvd)
                tryOpt("-chapter", self.opts.chapter)
                tryOpt("-aid", self.opts.audioid)
                tryOpt("-sid", self.opts.subtitleid)
-               tryOpt("-vf", self.opts.vfilters)
+               tryOpt("-vf-add", self.opts.vfilters)
                tryOpt("-af", self.opts.afilters)
 
        def substValues(self, cmd):
@@ -121,6 +123,7 @@ def parse_args():
 
        parser = optparse.OptionParser(usage="%prog [options] input output")
        parser.add_option("--dvd", action="store", dest="dvd")
+       parser.add_option("--deinterlace", action="store_true", dest="deinterlace")
        parser.add_option("--vfilters", action="store", dest="vfilters")
        parser.add_option("--afilters", action="store", dest="afilters")
        parser.add_option("--vbitrate", action="store", dest="vbitrate", type="int", default=1000)