Packman Build Service PMBS

ffxvid.changes Changed

ffxvid.spec Changed

ffxvid-1.2.5.tar.gz/ChangeLog -> ffxvid-1.2.6.tar.gz/ChangeLog Changed

ffxvid-1.2.5.tar.gz/ffxvid -> ffxvid-1.2.6.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.2.5
-# Date: 2018-01-04
+# Version: 1.2.6
+# Date: 2018-01-09
 #
 # 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.2.5"
+version="1.2.6"
 
 CFG="$HOME/.ffxvid"
 cfgversion="8"
@@ -994,13 +994,13 @@
 						bt2020-12)		ztrans="2020_12" ;;
 						*)			ztrans="${VCHARS[3]}" ;;
 					esac
-					zscale=",zscale=transfer=$ztrans"
+					zscale="zscale=transfer=$ztrans"
 					colcopy="1"
 				fi
 				;;
-				1)	zscale=",zscale=transfer=bt709" ;;
-				2)	zscale=",zscale=transfer=bt470bg" ;;
-				3)	zscale=",zscale=transfer=smpte170m" ;;
+				1)	zscale="zscale=transfer=bt709" ;;
+				2)	zscale="zscale=transfer=bt470bg" ;;
+				3)	zscale="zscale=transfer=smpte170m" ;;
 				*)
 				error "-> Invalid option!"
 				exit 1
@@ -1012,10 +1012,10 @@
 				if [ "$satcor" = "y" -o "$satcor" = "Y" ]; then
 					printf "Specify the Saturation Strength [0.0-3.0 - default is 1.25]: "
 					read satval
-					test -z "$satval" && eq=",eq=saturation=1.25" || eq=",eq=saturation=$satval"
+					test -z "$satval" && eq="eq=saturation=1.25,$pixformat" || eq="eq=saturation=$satval,$pixformat"
 				fi
 			fi
-			test ! -z "$zscale" && tonemap="zscale=transfer=linear,tonemap=$tm_algo$tm_param$tm_desat$zscale$eq,"
+			test ! -z "$zscale" && tonemap="zscale=transfer=linear,tonemap=$tm_algo$tm_param$tm_desat,$zscale,"
 		fi
 	fi
 }
@@ -2736,7 +2736,9 @@
 			GETAUDBTR[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aindex[i]} -show_streams -of default=noprint_wrappers=1 | grep '^bit_rate' | awk -F= '{print $2}')"
 			
 			if [ ! -z "${GETAUDCDC[i]}" ]; then
-				test ! -z "${GETAUDBTR[i]}" && audbtrmeta[i]=" @ $(($(echo "${GETAUDBTR[i]}")/1000)) kbps"
+				case "${GETAUDBTR[i]}" in
+					[1-9]*)	audbtrmeta[i]=" @ $(($(echo "${GETAUDBTR[i]}")/1000)) kbps" ;;
+				esac
 				audmeta[i]="-metadata:s:a:${audindex[i]} title=\"${GETAUDCDC[i]}${audbtrmeta[i]}\""
 			fi
 		fi
@@ -2856,7 +2858,7 @@
 
 test "$CHAPS" = "n" && CHPS="-map_chapters -1"
 
-vidfilters="$(echo "$deinterlace$detelecine$tonemap$pixformat$colorspace$crop$deblock$denoise$scale$unsharp$rotate$setpts$fps$framestep" | sed 's|,$||')"
+vidfilters="$(echo "$deinterlace$detelecine$tonemap$pixformat$colorspace$crop$deblock$denoise$scale$unsharp$eq$rotate$setpts$fps$framestep" | sed 's|,$||')"
 
 test ! -z "$vidfilters" && vfilters="-vf $vidfilters"

Changes of Revision 27