From: Greg Darke <greg+kokonoe@tsukasa.net.au>
Date: Wed, 26 Nov 2008 04:46:47 +0000 (+1100)
Subject: Automated merge with http://delx.net.au/hg/transcoding
X-Git-Url: https://code.delx.au/transcoding/commitdiff_plain/13b524fc4eb8ab1243a3fd6ba2b1625b4a2e37ed?hp=758a8e724dd7470d917156e3c5e80b03cbf678ae

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

diff --git a/encode.py b/encode.py
index f56eb54..2cc7d00 100755
--- 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)