Packman Build Service PMBS

ffx264.changes Changed

ffx264.spec Changed

ffx264-4.2.11.tar.gz/ChangeLog -> ffx264-4.2.12.tar.gz/ChangeLog Changed

ffx264-4.2.11.tar.gz/ffx264 -> ffx264-4.2.12.tar.gz/ffx264 Changed

@@ -2,8 +2,8 @@
 #
 # Small script to encode to H.264/AVC video using FFmpeg and libx264.
 # Author: Grozdan "microchip" Nikolov <neutrino8@gmail.com>
-# Version: 4.2.11
-# Date: 2024-11-28
+# Version: 4.2.12
+# Date: 2024-12-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 "\e0;33m$1\e0;39;49m"; }
 error() { echo -e "\e1;31m$1\e0;39;49m"; }
 
-version="4.2.11"
+version="4.2.12"
 
 CFG="$HOME/.ffx264"
 cfgversion="45"
@@ -1623,17 +1623,9 @@
 }
 
 if  "$AUTOCROP" = "y" ; then
-	if  ! -z "$batchmode" ; then
-		printf "Auto-Crop the Input Files? y/N: "
-		read autocrop
-		if  "$autocrop" = "y" -o "$autocrop" = "Y" ; then
-			CROPVAL="\$($FFMPEG -ss \$((\$VLENGTH/2)) -i \"\$i\" $vidmap -vf cropdetect -frames:v 1000 -f null - 2>&1 | awk '/crop/ {print \$NF}' | awk -F= '{print \$2}' | tail -1)"
-			# CROPVAL="\$($MPLAYER \"\$i\" -noconfig all -loop 1 -vid $vidtrack -frames 250 -ss \$((\$VLENGTH/2)) -vf cropdetect=24:4 -ao null -vo null -nocache 2>/dev/null | tr '\r' '\n' | grep 'crop=' | tail -n 1 | awk '{print \$9}' | sed 's|crop=||g; s|).||g')"
-			crop="crop=\$CROPVAL,"
-		fi
-	else
+	video_crop_func() {
 		echo
-		green "-> Detecting crop values..."
+		green "-> ${INFO}Detecting crop values..."
 		video_length_func file
 		if  -z "$VLENGTH" -o "$VLENGTH" = "N/A" ; then
 			vlength="300"
@@ -1641,13 +1633,24 @@
 			vlength="$VLENGTH"
 		fi
 		CROPVAL="$($FFMPEG -ss $(($vlength/2)) -i "$input" $vidmap -vf cropdetect -frames:v 1000 -f null - 2>&1 | awk '/crop/ {print $NF}' | awk -F= '{print $2}' | tail -1)"
-		# CROPVAL="$($MPLAYER "$input" -noconfig all -loop 1 -vid $vidtrack -frames 250 -ss $(($vlength/2)) -vf cropdetect=24:4 -ao null -vo null -nocache 2>/dev/null | tr '\r' '\n' | grep 'crop=' | tail -n 1 | awk '{print $9}' | sed 's|crop=||g; s|).||g')"		if  ! -z "$CROPVAL" ; then
 		if  ! -z "$CROPVAL" ; then
-			green "-> Found crop values: $CROPVAL"
+			green "-> ${INFO}Found crop values: $CROPVAL"
 		else
-			error "-> Could not find the crop values!"
+			error "-> ${INFO}Could not find the crop values!"
 			CDEF="???"
 		fi
+	}
+	if  ! -z "$batchmode" ; then
+		printf "Auto-Crop the Input Files? y/N: "
+		read autocrop
+		if  "$autocrop" = "y" -o "$autocrop" = "Y" ; then
+			INFO="INFO: "
+			CROPVAL="\$($FFMPEG -ss \$((\$VLENGTH/2)) -i \"\$i\" $vidmap -vf cropdetect -frames:v 1000 -f null - 2>&1 | awk '/crop/ {print \$NF}' | awk -F= '{print \$2}' | tail -1)"
+			crop="crop=\$CROPVAL,"
+			video_crop_func
+		fi
+	else
+		video_crop_func
 		echo
 		CROPDETERMINED="n"
 		while  "$CROPDETERMINED" != "y" ; do
@@ -3269,9 +3272,9 @@
 				printf "Track $i: Set the Audio Volume? y/N: "
 				read setavoli
 				if  "${setavoli}" = "y" -o "${setavoli}" = "Y" ; then
-					printf "Track $i: Specify the Audio Volume value in dB -100-100 - default is 4.0: "
+					printf "Track $i: Specify the Audio Volume value in dB -100-100 - default is 2.0: "
 					read avoli
-					test -z "${avoli}" && audvoli="4" || audvoli="${avoli}"
+					test -z "${avoli}" && audvoli="2" || audvoli="${avoli}"
 					avolumei="volume=${audvoli}dB,"
 				fi
 			fi

Changes of Revision 174