Packman Build Service PMBS

ffx264.changes Changed

ffx264.spec Changed

ffx264-3.4.6.tar.gz/ChangeLog -> ffx264-3.4.7.tar.gz/ChangeLog Changed

ffx264-3.4.6.tar.gz/ffx264 -> ffx264-3.4.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.4.6
-# Date: 2017-06-09
+# Version: 3.4.7
+# Date: 2017-06-10
 #
 # 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="3.4.6"
+version="3.4.7"
 
 CFG="$HOME/.ffx264"
 cfgversion="32"
@@ -730,7 +730,7 @@
 	echo
 	green "-> Detecting Field Parity..."
 	sleep 1
-	FPAR="$($FFPROBE -i "$input" -v error -select_streams v:0 -show_entries stream=field_order -of default=noprint_wrappers=1:nokey=1)"
+	FPAR="$($FFPROBE -i "$input" -v error -select_streams v:0 -show_entries stream=field_order -of default=noprint_wrappers=1:nokey=1 | tail -1)"
 	case "$FPAR" in
 		t*|T*)	fp="tff"; fparity="Top Field First (TFF)" ;;
 		b*|B*)	fp="bff"; fparity="Bottom Field First (BFF)" ;;
@@ -902,10 +902,10 @@
 video_chars_func() {
 	for i in {1..4}; do
 		case "$i" in
-			1)	char1="color_range" ;;
-			2)	char2="color_space" ;;
-			3)	char3="color_transfer" ;;
-			4)	char4="color_primaries" ;;
+			1)	chari="color_range" ;;
+			2)	chari="color_space" ;;
+			3)	chari="color_transfer" ;;
+			4)	chari="color_primaries" ;;
 		esac
 		CHARSi="$($FFPROBE -i "$input" -v error -select_streams v:0 -show_entries stream=${chari} -of default=noprint_wrappers=1:nokey=1 | tail -1)"
 	done
@@ -933,8 +933,13 @@
 			irange="mpeg"
 			orange="tv"
 		else
-			irange="$(echo "$crange" | awk -F/ '{print $1}')"
-			orange="$(echo "$crange" | awk -F/ '{print $2}')"
+			if  ! -z "$(echo "$crange" | grep '/')" ; then
+				irange="$(echo "$crange" | awk -F/ '{print $1}')"
+				orange="$(echo "$crange" | awk -F/ '{print $2}')"
+			else
+				error "-> Invalid format! Valid is: <input_range>/<output_range> (eg: mpeg/tv)"
+				exit 1
+			fi
 		fi
 		video_csmisc_func() {
 			printf "Use 10- or 12-bits BT2020 Transfer? default is 10: "
@@ -1114,8 +1119,8 @@
 # calc for target file size
 video_length_func() {
 	case "$1" in
-		file)	VLENGTH="$($FFPROBE -i "$input" -v error -select_streams v:0 -show_entries format=duration -of default=noprint_wrappers=1:nokey=1 | awk -F. '{print $1}')" ;;
-		batch)	echo "VLENGTH=\"\$($FFPROBE -i \"\$i\" -v error -select_streams v:0 -show_entries format=duration -of default=noprint_wrappers=1:nokey=1 | awk -F. '{print \$1}')\"" ;;
+		file)	VLENGTH="$($FFPROBE -i "$input" -v error -select_streams v:0 -show_entries format=duration -of default=noprint_wrappers=1:nokey=1 | tail -1 | awk -F. '{print $1}')" ;;
+		batch)	echo "VLENGTH=\"\$($FFPROBE -i \"\$i\" -v error -select_streams v:0 -show_entries format=duration -of default=noprint_wrappers=1:nokey=1 | tail -1 | awk -F. '{print \$1}')\"" ;;
 	esac
 }
 
@@ -2477,7 +2482,7 @@
 					green "-> Track $i: detecting audio sample rate..."
 					sleep 1
 					aidi="$(($(echo "${atracki}" | awk -F: '{print $2}')-1))"
-					ASRi="$($FFPROBE -i "$input" -v error -select_streams a:${aidi} -show_entries stream=sample_rate -of default=noprint_wrappers=1:nokey=1)"
+					ASRi="$($FFPROBE -i "$input" -v error -select_streams a:${aidi} -show_entries stream=sample_rate -of default=noprint_wrappers=1:nokey=1 | tail -1)"
 					if  ! -z "${ASRi}" ; then
 						green "-> Track $i: detected ${ASRi} Hz"
 					else
@@ -2727,7 +2732,7 @@
 				for i in $(eval echo "{1..$ATRACKS}"); do
 					if  "${acodeci}" = "copy" ; then
 						aidi="$(($(echo "${atracki}" | awk -F: '{print $2}')-1))"
-						abtri="$($FFPROBE -i "$input" -v error -select_streams a:${aidi} -show_entries stream=bit_rate -of default=noprint_wrappers=1:nokey=1)"
+						abtri="$($FFPROBE -i "$input" -v error -select_streams a:${aidi} -show_entries stream=bit_rate -of default=noprint_wrappers=1:nokey=1 | tail -1)"
 						case "${abtri}" in
 							1-9*)	abitratei="$((${abtri}/1000))" ;;
 							""|*)	abitratei="0" ;;

Changes of Revision 57