]> code.delx.au - transcoding/commitdiff
Fixed mplayer parameter ordering
authorJames Bunton <jamesbunton@fastmail.fm>
Mon, 20 Sep 2010 00:15:49 +0000 (10:15 +1000)
committerJames Bunton <jamesbunton@fastmail.fm>
Mon, 20 Sep 2010 00:15:49 +0000 (10:15 +1000)
encode.py

index 9300ceaee175191d82757f39b9e21783d446ea78..769baf881e0812ad60fb206cec2f21e0d4a152a3 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):