Packman Build Service PMBS

ffxvid.changes Changed

ffxvid.spec Changed

ffxvid-1.1.2.tar.gz/ChangeLog -> ffxvid-1.1.3.tar.gz/ChangeLog Changed

ffxvid-1.1.2.tar.gz/ffxvid -> ffxvid-1.1.3.tar.gz/ffxvid Changed

@@ -2,8 +2,8 @@
 #
 # Small script to encode to Xvid video using FFmpeg.
 # Author: Grozdan "microchip" Nikolov <neutrino8@opensuse.org>
-# Version: 1.1.2
-# Date: 2017-06-05
+# Version: 1.1.3
+# Date: 2017-06-08
 #
 # ffx264 is free software ; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 brown() { echo -e "\e[0;33m$1\e[0;39;49m"; }
 error() { echo -e "\e[1;31m$1\e[0;39;49m"; }
 
-version="1.1.2"
+version="1.1.3"
 
 CFG="$HOME/.ffxvid"
 cfgversion="6"
@@ -72,7 +72,7 @@
 # 6 = gaussian
 # 7 = sinc
 # 8 = lanczos
-# 9 = spline
+# 9 = natural bicubic spline
 # 10 = experimental
 #
 SCALER=""
@@ -1101,7 +1101,7 @@
 				[0-9]|10)
 				sws_func config
 				echo
-				green "-> Using software scaler set in config file '$CFG'"
+				green "-> Using software scaler '$scaler' set in config file '$CFG'"
 				echo
 				;;
 				*)
@@ -1111,46 +1111,7 @@
 			esac
 		fi
 		case "$swsopt" in
-			2)
-			echo
-			brown "Scaler Tuning"
-			brown "~~~~~~~~~~~~~"
-			echo " 0 -> Default (0.00, 0.60)"
-			echo " 1 -> VirtualDub's \"Precise Bicubic\" (0.00, 0.75)"
-			echo " 2 -> Custom"
-			echo
-			printf "Select the Scaler Tuning option [default is 0]: "
-			read swstune
-			case "$swstune" in
-				0|"")	swsparam0=":param0=0.00"; swsparam1=":param1=0.60" ;;
-				1)	swsparam0=":param0=0.00"; swsparam1=":param1=0.75" ;;
-				2)
-				printf "Specify the Custom Scaler Tuning options [default is 0.00:0.60]: "
-				read swscus
-				if [ ! -z "$swscus" ]; then
-					swsparam0=":param0=$(echo "$swscus" | awk -F: '{print $1}')"
-					swsparam1=":param1=$(echo "$swscus" | awk -F: '{print $2}')"
-				fi
-				;;
-				*)
-				error "-> Invalid option!"
-				exit 1
-				;;
-			esac
-			;;
-			6|8)
-			if [ "$swsopt" = "6" ]; then
-				swscaler="Gaussian"
-				swsharp="0-100"
-			else
-				swscaler="Lanczos"
-				swsharp="0-10"
-			fi
-			printf "Specify the $swscaler scaler Sharpness [$swsharp - default is 0]: "
-			read swstune
-			test ! -z "$swstune" && swsparam0=":param0=$swstune"
-			;;
-			9)
+			2|9)
 			echo
 			brown "Scaler Tuning"
 			brown "~~~~~~~~~~~~~"
@@ -1168,7 +1129,7 @@
 				2)	swsparam0=":param0=0.33"; swsparam1=":param1=0.33" ;;
 				3)	swsparam0=":param0=1.00"; swsparam1=":param1=0.00" ;;
 				4)
-				printf "Specify the Custom Scaler Tuning options [default is 0.00:0.60]: "
+				printf "Specify the Custom Scaler Tuning values [default is 0.00:0.60]: "
 				read swscus
 				if [ ! -z "$swscus" ]; then
 					swsparam0=":param0=$(echo "$swscus" | awk -F: '{print $1}')"
@@ -1181,6 +1142,22 @@
 				;;
 			esac
 			;;
+			6|8)
+			if [ "$swsopt" = "6" ]; then
+				swscaler="Gaussian"
+				swsval="0-100"
+				swsdef="0"
+				swstype="Sharpness"
+			else
+				swscaler="Lanczos"
+				swsval="1-10"
+				swsdef="1"
+				swstype="Filter Length"
+			fi
+			printf "Specify the $swscaler scaler $swstype [$swsval - default is $swsdef]: "
+			read swstune
+			test ! -z "$swstune" && swsparam0=":param0=$swstune"
+			;;
 		esac
 		printf "Enable Accurate Rounding? [y/N]: "
 		read around

Changes of Revision 13