Fixed bug with new SCALE variable setting for mencoder

[rip_dvd/.git] / rip_dvd

diff --git a/rip_dvd b/rip_dvd
index f53f99aaa45e0372b1d9e77caa08a3b630bdc7a7..9a6d47110ddd90d66c24633d998114f3f3f8d6bc 100755 (executable)
--- a/rip_dvd
+++ b/rip_dvd
@@ -110,7 +110,7 @@ function usage() {
     echo >&2 "   -b <bitrate>  Set the bitrate desired in the AVI file in kbits/sec (ex: 1500, 2000 (default), etc)"    
     echo >&2 "   -a <W:H>      Specify the width x height aspect ratio to scale the DVD to (only used in -x mode)"
     echo >&2 "      <W>        If only the width is given, it will autoset the height to a value which preserves the aspect ratio"
-    echo >&2 "                 The default behavior is autoaspect mode, which preserves the original aspect."
+    echo >&2 "                 The default behavior is autoaspect mode, which preserves the original aspect, with no scaling being done"
     echo >&2 "   -2            Use 2 channel MP3 audio encoding when making an AVI file (default is 6 channel AC3)"
     echo >&2 "   -k            Keep the intermediate files (good for debugging)"
     echo >&2 "                 In -x mode, run with this option to keep the original .VOB file"
@@ -165,9 +165,9 @@ if [ "$aspect" != "" ]; then
   fi
   echo "$aspect" | grep -q ":"
   if [ $? != 0 ]; then
-    SCALE="scale -zoom -xy $aspect"
+    SCALE=",scale -zoom -xy $aspect"
   else
-    SCALE="scale=$aspect"
+    SCALE=",scale=$aspect"
   fi
 fi
 
@@ -920,7 +920,7 @@ if [ $mirror_mode -eq 0 ]; then
       # Edit these as needed to suite your needs
       mencoder_general_opts="-quiet $lang_opts -passlogfile $passlogfile"
       mencoder_output_opts="-ofps 30000/1001 -ffourcc DIVX"
-      mencoder_video_filter_opts="-vf pullup,softskip,hqdn3d=2:1:2$CROP,$SCALE"
+      mencoder_video_filter_opts="-vf pullup,softskip,hqdn3d=2:1:2$CROP$SCALE"
       mencoder_video_encoder_opts="-ovc xvid -xvidencopts pass=%PASS:chroma_opt:vhq=4:bvhq=1:quant_type=mpeg:bitrate=$target_bitrate:autoaspect:threads=$mencoder_threads"
 
       # There are a number of different ways to encode 6 channel audio.