Packman Build Service PMBS

ffx264.changes Changed

ffx264.spec Changed

ffx264-3.2.6.tar.gz/ChangeLog -> ffx264-3.2.7.tar.gz/ChangeLog Changed

ffx264-3.2.6.tar.gz/ffx264 -> ffx264-3.2.7.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@opensuse.org>
-# Version: 3.2.6
-# Date: 2017-01-08
+# Version: 3.2.7
+# Date: 2017-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="3.2.6"
+version="3.2.7"
 
 CFG="$HOME/.ffx264"
 cfgversion="29"
@@ -360,6 +360,12 @@
 	fi
 fi
 
+BC="$(which bc 2>/dev/null)"
+if [ ! -x "$BC" ]; then
+	error "-> Utility 'bc' is missing from your system!"
+	exit 1
+fi
+
 if [ -z "$OUTDIR" ]; then
 	error "-> OUTDIR is not set in the config file!"
 	error "-> Check your config in '$CFG'"
@@ -713,7 +719,7 @@
 
 # Used by mc/bobbing deinterlace and FPS conversion
 video_fps_func() {
-	GETFPS="$($FFPROBE -i "$input" -v error -select_streams v:0 -show_entries stream=r_frame_rate -of default=noprint_wrappers=1:nokey=1)"
+	GETFPS="$($FFPROBE -i "$input" -v error -select_streams v:0 -show_entries stream=r_frame_rate -of default=noprint_wrappers=1:nokey=1 | tail -1)"
 }
 
 # Used by mc/bobbing deinterlace, IVTC and interlace-aware encoding
@@ -779,8 +785,8 @@
 				FPS1="$(echo "$GETFPS" | awk -F/ '{print $1}')"
 				FPS2="$(echo "$GETFPS" | awk -F/ '{print $2}')"
 				OFPS="$(($FPS1*2))/$FPS2"
-				green "-> Detected: $FPS1/$FPS2 FPS"
-				green "-> Setting output FPS to: $OFPS"
+				green "-> Detected $(echo "scale=3; $GETFPS" | $BC -l) FPS"
+				green "-> Setting output FPS to: $(echo "scale=3; $OFPS" | $BC -l)"
 				ofps="-r $OFPS"
 			else
 				error "-> Could not detect the FPS value!"
@@ -1015,7 +1021,7 @@
 		sleep 1
 		video_fps_func
 		if [ ! -z "$GETFPS" ]; then
-			green "-> Detected $GETFPS FPS"
+			green "-> Detected $(echo "scale=3; $GETFPS" | $BC -l) FPS"
 		else
 			error "-> Could not detect the FPS value!"
 		fi
@@ -1028,12 +1034,12 @@
 				""|*)
 				echo
 				error "-> Detected FPS is not supported yet!"
-				error "-> Supported FPS are: 24/1, 25/1, 24000/1001 and 30000/1001"
+				error "-> Supported FPS are: 23.976, 24, 25 and 29.970"
 				echo
 				printf "Specify the FPS value of the Input File [no default!]: "
 				read infps
 				case "$infps" in
-					24/1|25/1|24000/1001|30000/1001) true ;;
+					23.976|24|25|29.970) true ;;
 					""|*)
 					error "-> Unsupported or no value given!"
 					exit 1
@@ -2067,7 +2073,7 @@
 echo "green() { echo -e \"\e[1;32m\$1\e[0;39;49m\"; }" >> "$OUTFILE"
 echo "red() { echo -e \"\e[1;31m\$1\e[0;39;49m\"; }" >> "$OUTFILE"
 echo "" >> "$OUTFILE"
-echo "test ! -d \"\$(dirname \"$OUTFILE\")\" && mkdir -p \"\$(dirname \"$OUTFILE\")\"" >> "$OUTFILE"
+echo "test ! -d \"$(dirname "$OUTFILE")\" && mkdir -p \"$(dirname "$OUTFILE")\"" >> "$OUTFILE"
 echo "" >> "$OUTFILE"
 if [ ! -z "$batchmode" ]; then
 	echo "$CHDIR" >> "$OUTFILE"

Changes of Revision 35