Packman Build Service PMBS

ffxvid.changes Changed

ffxvid.spec Changed

ffxvid-1.1.4.tar.gz/ChangeLog -> ffxvid-1.1.5.tar.gz/ChangeLog Changed

ffxvid-1.1.4.tar.gz/ffxvid -> ffxvid-1.1.5.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.4
-# Date: 2017-06-09
+# Version: 1.1.5
+# 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 "\e[0;33m$1\e[0;39;49m"; }
 error() { echo -e "\e[1;31m$1\e[0;39;49m"; }
 
-version="1.1.4"
+version="1.1.5"
 
 CFG="$HOME/.ffxvid"
 cfgversion="6"
@@ -657,7 +657,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)" ;;
@@ -829,10 +829,10 @@
 video_chars_func() {
 	for i in ${1..4}; do
 		case "$i" in
-			1)	char[1]="color_range" ;;
-			2)	char[2]="color_space" ;;
-			3)	char[3]="color_transfer" ;;
-			4)	char[4]="color_primaries" ;;
+			1)	char[i]="color_range" ;;
+			2)	char[i]="color_space" ;;
+			3)	char[i]="color_transfer" ;;
+			4)	char[i]="color_primaries" ;;
 		esac
 		CHARS[i]="$($FFPROBE -i "$input" -v error -select_streams v:0 -show_entries stream=${char[i]} -of default=noprint_wrappers=1:nokey=1 | tail -1)"
 	done
@@ -860,8 +860,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]: "
@@ -1028,8 +1033,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
 }
 
@@ -2320,7 +2325,7 @@
 					green "-> Track $i: detecting audio sample rate..."
 					sleep 1
 					aid[i]="$(($(echo "${atrack[i]}" | awk -F: '{print $2}')-1))"
-					ASR[i]="$($FFPROBE -i "$input" -v error -select_streams a:${aid[i]} -show_entries stream=sample_rate -of default=noprint_wrappers=1:nokey=1)"
+					ASR[i]="$($FFPROBE -i "$input" -v error -select_streams a:${aid[i]} -show_entries stream=sample_rate -of default=noprint_wrappers=1:nokey=1 | tail -1)"
 					if [ ! -z "${ASR[i]}" ]; then
 						green "-> Track $i: detected ${ASR[i]} Hz"
 					else
@@ -2570,7 +2575,7 @@
 				for i in $(eval echo "{1..$ATRACKS}"); do
 					if [ "${acodec[i]}" = "copy" ]; then
 						aid[i]="$(($(echo "${atrack[i]}" | awk -F: '{print $2}')-1))"
-						abtr[i]="$($FFPROBE -i "$input" -v error -select_streams a:${aid[i]} -show_entries stream=bit_rate -of default=noprint_wrappers=1:nokey=1)"
+						abtr[i]="$($FFPROBE -i "$input" -v error -select_streams a:${aid[i]} -show_entries stream=bit_rate -of default=noprint_wrappers=1:nokey=1 | tail -1)"
 						case "${abtr[i]}" in
 							[1-9]*)	abitrate[i]="$((${abtr[i]}/1000))" ;;
 							""|*)	abitrate[i]="0" ;;

Changes of Revision 15