Packman Build Service PMBS

xvidenc.changes Changed

xvidenc.spec Changed

xvidenc-8.4.0.tar.gz/doc/ChangeLog -> xvidenc-8.4.1.tar.gz/doc/ChangeLog Changed

xvidenc-8.4.0.tar.gz/xvidenc -> xvidenc-8.4.1.tar.gz/xvidenc Changed

@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: xvidenc, v 8.4.0, 2011/01/31, gn Exp $
+# $Id: xvidenc, v 8.4.1, 2011/03/07, gn Exp $
 # UUID: 1ff8ecff-b178-4d64-b084-71ebd7972fe7
 #
 # Encode DVDs/video files to the Xvid 1.1.x video codec
@@ -23,7 +23,7 @@
 
 shopt -u expand_aliases
 export PATH=$PATH:/usr/local/bin
-version=8.4.0
+version=8.4.1
 configversion=16
 
 green() { echo -e "\e[1;32m$1\e[0;39;49m"; }
@@ -59,8 +59,8 @@
 # a # sign is a comment.
 #
 # The EDITOR variable is used to set the preferred text editor for
-# editing the config file through the terminal. It default to the
-# nano text editor
+# editing the config file through the terminal. It defaults to the
+# nano text editor.
 #
 # The ALLOW_* variables can be used to enable or disable specific
 # audio/video filters and containers. Setting a variable to 'n' will
@@ -1936,7 +1936,7 @@
 			if [ -z "$dbqlevel" ]; then
 				deblockfilter="spp=3,"
 			else
-				deblockfilter="spp=$dbql,"
+				deblockfilter="spp=$dbqlevel,"
 			fi
 			;;
 			1)
@@ -1945,7 +1945,7 @@
 			if [ -z "$dbqlevel" ]; then
 				deblockfilter="uspp=2,"
 			else
-				deblockfilter="uspp=$dbql,"
+				deblockfilter="uspp=$dbqlevel,"
 			fi
 			;;
 			2)
@@ -1954,7 +1954,7 @@
 			if [ -z "$dbqlevel" ]; then
 				deblockfilter="fspp=4,"
 			else
-				deblockfilter="fspp=$dbql,"
+				deblockfilter="fspp=$dbqlevel,"
 			fi
 			;;
 			3)
@@ -1985,7 +1985,7 @@
 			if [ -z "$dfv" ]; then
 				deblockfilter="pp=ha:164:7:c/va:c/dr:c,"
 			else
-				deblockfilter="pp=ha:$dbvalues:c/va:c/dr:c,"
+				deblockfilter="pp=ha:$dfv:c/va:c/dr:c,"
 			fi
 			;;
 			5)
@@ -2006,7 +2006,7 @@
 			if [ -z "$dfv" ]; then
 				deblockfilter="pp=ha:164:7:c/va:c,"
 			else
-				deblockfilter="pp=ha:$dbvalues:c/va:c,"
+				deblockfilter="pp=ha:$dfv:c/va:c,"
 			fi
 			;;
 			6)
@@ -3074,10 +3074,11 @@
 		rmtemp
 	fi
 	sourcetype="$infile"
-	printf "Where to store the encodings? [default is $HOME/xvidenc_$$]: "
+	test -d "$DEFOUTPUT" && DEFBATCHDIR="$DEFOUTPUT" || DEFBATCHDIR="$HOME"
+	printf "Where to store the encodings? [default is $DEFBATCHDIR/xvidenc_$$]: "
 	read -e outdir
 	if [ -z "$outdir" ]; then
-		OUTPUTDIR="$HOME/xvidenc_$$"
+		OUTPUTDIR="$DEFBATCHDIR/xvidenc_$$"
 		if [ ! -d "$OUTPUTDIR" ]; then
 			mkdir -p "$OUTPUTDIR" 2>/dev/null
 			if [ $? != 0 ]; then
@@ -3086,7 +3087,6 @@
 				rmtemp
 			fi
 		fi
-		OUTPUT="$OUTPUTDIR/\${i%.*}.avi"
 	else
 		if [ "$(dirname "$sourcetype")" = "$outdir" ]; then
 			error "-> You can't use the input directory as output directory!"
@@ -3101,8 +3101,8 @@
 				rmtemp
 			fi
 		fi
-		OUTPUT="$OUTPUTDIR/\${i%.*}.avi"
 	fi
+	OUTPUT="$OUTPUTDIR/\${i%.*}.avi"
 	printf "Would you like to use Pre/Postprocessing video filters? [y/N]: "
 	read vfilters
 	video_filters_func
@@ -5659,8 +5659,15 @@
 	echo "" >> "$BATCH"
 	echo "for i in *; do" >> "$BATCH"
 	echo "" >> "$BATCH"
+	echo "if [ -f \"\$i\" ]; then" >> "$BATCH"
+	echo "" >> "$BATCH"
 	echo "test -d \"$TEMPDIR\" || mkdir -p \"$TEMPDIR\"" >> "$BATCH"
 	echo "" >> "$BATCH"
+	echo "echo" >> "$BATCH"
+	echo "echo -e \"\e[1;32m-> Processing file '$(dirname "$sourcetype")/\$i'\e[0;39;49m\"" >> "$BATCH"
+	echo "echo" >> "$BATCH"
+	echo "sleep 3" >> "$BATCH"
+	echo "" >> "$BATCH"
 	echo "$(mencoder_opts $1 | sed "s|$sourcetype|\$i|g")" >> "$BATCH"
 	echo "" >> "$BATCH"
 	;;
@@ -6809,6 +6816,8 @@
 	fi
 	echo "rm -rf \"$TEMPDIR\"" >> "$BATCH"
 	echo "" >> "$BATCH"
+	echo "fi" >> "$BATCH"
+	echo "" >> "$BATCH"
 	echo "done" >> "$BATCH"
 	echo "" >> "$BATCH"
 	send_email_func exp >> "$BATCH"

Changes of Revision 2