-vop ---> -vf

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11262 b3059339-0415-0410-9bf9-f77b7e298cf2

3 files changed, 13 insertions, 13 deletions

diff --git a/TOOLS/benchmark-gab/benchmark b/TOOLS/benchmark-gab/benchmark
index 04a0d0e876..4905fb09e8 100755
--- a/TOOLS/benchmark-gab/benchmark
+++ b/TOOLS/benchmark-gab/benchmark
@@ -43,7 +43,7 @@ wrtlog Starting benchmarks
 
 if [ ! -e no_codec ]; then
   wrtlog Starting CODEC benchmark runs, with 3 tries...
-  DEFAULTOPTS="-quiet -nosound -benchmark -vo null -vop disabled -autoq 0"
+  DEFAULTOPTS="-quiet -nosound -benchmark -vo null -vf disabled -autoq 0"
   benchsamples
 fi
 
@@ -53,25 +53,25 @@ export XAUTHORITY=$HOME/.Xauthority
 if [ ! -e no_xv ]; then
   if [ ! -e no_xv_nodr ]; then
     wrtlog Starting XVideo \(no DR\) benchmark runs, with 3 tries...
-    DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -nodr -slices -vop disabled -autoq 0"
+    DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -nodr -slices -vf disabled -autoq 0"
     benchsamples
   fi
 
   if [ ! -e no_xv_nodr_noslices ]; then
     wrtlog Starting XVideo \(no DR\) \(no slices\) benchmark runs, with 3 tries...
-    DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -nodr -noslices -vop disabled -autoq 0"
+    DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -nodr -noslices -vf disabled -autoq 0"
     benchsamples
   fi
 
   if [ ! -e no_xv_dr ]; then
     wrtlog Starting XVideo \(DR\) benchmark runs, with 3 tries...
-    DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -dr -slices -vop disabled -autoq 0"
+    DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -dr -slices -vf disabled -autoq 0"
     benchsamples
   fi
 
   if [ ! -e no_xv_dr_noslices ]; then
     wrtlog Starting XVideo \(DR\) \(no slices\) benchmark runs, with 3 tries...
-    DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -dr -noslices -vop disabled -autoq 0"
+    DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -dr -noslices -vf disabled -autoq 0"
     benchsamples
   fi
 fi
@@ -79,25 +79,25 @@ fi
 if [ -e xmga ]; then
   if [ ! -e xmga_nodr ]; then
     wrtlog Starting XMGA \(no DR\) benchmark runs, with 3 tries...
-    DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -slices -vop disabled -autoq 0"
+    DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -slices -vf disabled -autoq 0"
     benchsamples
   fi
 
   if [ ! -e xmga_nodr_noslices ]; then
     wrtlog Starting XMGA \(no DR\) \(no slices\) benchmark runs, with 3 tries...
-    DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -noslices -vop disabled -autoq 0"
+    DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -noslices -vf disabled -autoq 0"
     benchsamples
   fi
 
   if [ ! -e xmga_dr ]; then
     wrtlog Starting XMGA \(DR\) benchmark runs, with 3 tries...
-    DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -vop disabled -autoq 0"
+    DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -vf disabled -autoq 0"
     benchsamples
   fi
 
   if [ ! -e xmga_dr ]; then
     wrtlog Starting XMGA \(DR\) \(no slices\) benchmark runs, with 3 tries...
-    DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -noslices -vop disabled -autoq 0"
+    DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -noslices -vf disabled -autoq 0"
     benchsamples
   fi
 fi
diff --git a/TOOLS/mencvcd b/TOOLS/mencvcd
index 7be9d73aeb..bfbaa14cee 100755
--- a/TOOLS/mencvcd
+++ b/TOOLS/mencvcd
@@ -162,7 +162,7 @@ function usage() {
    echo "128 starting from 3:00 with frame rate 29.97 fps and input video norm NTSC"
    echo "and output frame rate 23.98 fps because of the 3:2 pulldown method in NTSC."
    echo
-   echo "'$HOWCALLED bj -size 640x272 -vop expand=640:480:0:104:0 \\"
+   echo "'$HOWCALLED bj -size 640x272 -vf expand=640:480:0:104:0 \\"
    echo "        -cdsize 645 -noburn bj.avi'"
    echo "this example above shows you, how to deal with movies which are not"
    echo "created with aspect ratios of 4:3 or 16:9."
@@ -296,7 +296,7 @@ while [ "$1"x != "x" ]; do
         shift 1
         ;;
       -sid) # mplayer option: have to set vop expand, too!!!
-        sub="-vop pp,expand=-1:-1:-1:-1:1 -sid $2"
+        sub="-vf pp,expand=-1:-1:-1:-1:1 -sid $2"
         shift 1
         ;;
       -size)
diff --git a/TOOLS/sws-test b/TOOLS/sws-test
index 7f6d498801..8ddd911900 100755
--- a/TOOLS/sws-test
+++ b/TOOLS/sws-test
@@ -7,13 +7,13 @@ if [ $# -lt 3 ] ; then
 fi
 
 for i in `seq 0 10` ; do
-	mplayer -vo png $1 -ss $2 -frames 3 -sws $i -vop scale=$3
+	mplayer -vo png $1 -ss $2 -frames 3 -sws $i -vf scale=$3
 	rm 00000001.png
 	mv 00000002.png sws-`basename $1`-$2-$3-$i.png
 done
 
 #gauss with lowwer variance
-        mplayer -vo png $1 -ss $2 -frames 3 -sws 7 -vop scale=$3:0:50
+        mplayer -vo png $1 -ss $2 -frames 3 -sws 7 -vf scale=$3:0:50
 	rm 00000001.png
 	mv 00000002.png sws-`basename $1`-$2-$3-7-50.png