From: James Bunton <jamesbunton@fastmail.fm>
Date: Mon, 20 Sep 2010 00:15:49 +0000 (+1000)
Subject: Fixed mplayer parameter ordering
X-Git-Url: https://code.delx.au/transcoding/commitdiff_plain/b418e6a3f84e2fd697bc808390097b14a006d110?hp=61e06b306fa3407d0c9a8bf66bc07bbc60a1e366

Fixed mplayer parameter ordering
---

diff --git a/encode.py b/encode.py
index 9300cea..769baf8 100755
--- 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):