Fixed option parser

[transcoding] / encode.py

diff --git a/encode.py b/encode.py
index 9300ceaee175191d82757f39b9e21783d446ea78..3aa3785f9a3da814b6cc5400827754b3a0611eff 100755 (executable)
--- a/encode.py
+++ b/encode.py
@@ -57,16 +57,6 @@ def insert_mplayer_options(cmd, o):
                return
 
        do_opt = partial(append_cmd, cmd)
-
-       if o.deinterlace:
-               cmd += ["-vf-pre", "yadif"]
-       if o.detelecine:
-               cmd += ["-vf-pre", "pullup,softskip", "-ofps", "24000/1001"]
-       if o.noskip:
-               cmd += ["-noskip"]
-       if o.skipkb:
-               cmd += ["-sb", str(o.skipkb * 1024)]
-
        do_opt("-mc", o.mc)
        do_opt("-ss", o.startpos)
        do_opt("-endpos", o.endpos)
@@ -77,6 +67,15 @@ def insert_mplayer_options(cmd, o):
        do_opt("-vf", o.vfilters)
        do_opt("-af", o.afilters)
 
+       if o.deinterlace:
+               cmd += ["-vf-pre", "yadif"]
+       if o.detelecine:
+               cmd += ["-vf-pre", "pullup,softskip", "-ofps", "24000/1001"]
+       if o.noskip:
+               cmd += ["-noskip"]
+       if o.skipkb:
+               cmd += ["-sb", str(o.skipkb * 1024)]
+
 
 class Command(object):
        def __init__(self, profile, opts):
@@ -420,7 +419,7 @@ def parse_args():
        parser.add_option("--dvd", action="store", dest="dvd")
        parser.add_option("--deinterlace", action="store_true", dest="deinterlace")
        parser.add_option("--detelecine", action="store_true", dest="detelecine")
-       parser.add_option("--mc", action="store", dest="mc", type="int")
+       parser.add_option("--mc", action="store", dest="mc", type="float")
        parser.add_option("--noskip", action="store_true", dest="noskip")
        parser.add_option("--vfilters", action="store", dest="vfilters")
        parser.add_option("--afilters", action="store", dest="afilters")