Packman Build Service PMBS

ffxvid.changes Changed

ffxvid.spec Changed

ffxvid-1.1.0.tar.gz/ChangeLog -> ffxvid-1.1.1.tar.gz/ChangeLog Changed

ffxvid-1.1.0.tar.gz/ffxvid -> ffxvid-1.1.1.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.0
-# Date: 2017-06-01
+# Version: 1.1.1
+# Date: 2017-06-04
 #
 # 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,10 +24,10 @@
 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.0"
+version="1.1.1"
 
 CFG="$HOME/.ffxvid"
-cfgversion="4"
+cfgversion="5"
 
 genconfig_func() {
 cat<<EOF>>"$CFG"
@@ -1049,6 +1049,36 @@
 	printf "Specify the Desired Resolution [WxH - press 'Enter' to skip]: "
 	read res
 	if [ ! -z "$res" ]; then
+		sws_func() {
+			case "$1" in
+				config)	swsopt="$SCALER" ;;
+				script)	test -z "$swsopt" && swsopt="9" || swsopt="$swsopt" ;;
+			esac
+			case "$swsopt" in
+				0)	scaler="fast_bilinear" ;;
+				1)	scaler="bilinear" ;;
+				2)	scaler="bicubic" ;;
+				3)	scaler="neighbor" ;;
+				4)	scaler="area" ;;
+				5)	scaler="bicublin" ;;
+				6)	scaler="gauss" ;;
+				7)	scaler="sinc" ;;
+				8)	scaler="lanczos" ;;
+				9)	scaler="spline" ;;
+				*)
+				case "$1" in
+					config)
+					error "-> Invalid software scaler in config file '$CFG'"
+					exit 1
+					;;
+					script)
+					error "-> Invalid option!"
+					exit 1
+					;;
+				esac
+				;;
+			esac
+		}
 		if [ -z "$SCALER" ]; then
 			echo
 			brown " Software Scalers"
@@ -1066,24 +1096,20 @@
 			echo
 			printf "Sepcify the Software Scaler [default is 9]: "
 			read swsopt
-			case "$swsopt" in
-				0)	scaler="fast_bilinear" ;;
-				1)	scaler="bilinear" ;;
-				2)	scaler="bicubic" ;;
-				3)	scaler="neighbor" ;;
-				4)	scaler="area" ;;
-				5)	scaler="bicublin" ;;
-				6)	scaler="gauss" ;;
-				7)	scaler="sinc" ;;
-				8)	scaler="lanczos" ;;
-				9|"")	scaler="spline" ;;
+			sws_func script
+		else
+			case "$SCALER" in
+				[0-9])
+				sws_func config
+				echo
+				green "-> Using software scaler set in config file '$CFG'"
+				echo
+				;;
 				*)
-				error "-> Invalid option!"
+				error "-> Invalid software scaler in config file '$CFG'"
 				exit 1
 				;;
 			esac
-		else
-			scaler="$SCALER"
 		fi
 		printf "Enable Accurate Rounding? [y/N]: "
 		read around

Changes of Revision 11