Packman Build Service PMBS

ffx264.changes Changed

ffx264.spec Changed

ffx264-3.2.1.tar.gz/ChangeLog -> ffx264-3.2.2.tar.gz/ChangeLog Changed

ffx264-3.2.1.tar.gz/Makefile -> ffx264-3.2.2.tar.gz/Makefile Changed

ffx264-3.2.1.tar.gz/ffx264 -> ffx264-3.2.2.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.1
-# Date: 2016-11-23
+# Version: 3.2.2
+# Date: 2016-12-02
 #
 # 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.1"
+version="3.2.2"
 
 CFG="$HOME/.ffx264"
 cfgversion="29"
@@ -118,7 +118,7 @@
 
 # Add a custom comment to your encodes
 # Leave empty to disable/ask each time
-COMMENT="Encoded with the help of ffx264"
+COMMENT="Encoded with the help of \$(basename \$0) \$version"
 
 #####################################################
 EOF
@@ -429,9 +429,6 @@
 else
 	printf "Specify a Name for the Output: "
 	read -e output
-fi
-
-if [ -z "$batchmode" ]; then
 	if [ -z "$output" ]; then
 		error "-> You have to provide a name for the output!"
 		exit 1
@@ -504,9 +501,9 @@
 read acf
 if [ "$acf" = "y" -o "$acf" = "Y" ]; then
 	printf "Specify the Container Formats [example: mp4,m2ts,mov - press 'Enter' to skip]: "
-	read econ
-	test ! -z "$econ" && extracon="$(echo "$econ" | tr '[:upper:]' '[:lower:]' | tr '[:punct:]' ' ')"
-	if [ ! -z "$extracon" ]; then
+	read rcon
+	test ! -z "$rcon" && remuxcon="$(echo "$rcon" | tr '[:upper:]' '[:lower:]' | tr '[:punct:]' ' ')"
+	if [ ! -z "$remuxcon" ]; then
 		container_func() {
 			case "$1" in
 				mp4|mov|m4v|avi|flv)
@@ -528,13 +525,13 @@
 			esac
 		}
 		
-		DUPS="$(echo -e "$extracon" | sed 's| |\n|g' | sort | uniq -d)"
+		DUPS="$(echo -e "$remuxcon" | sed 's| |\n|g' | sort | uniq -d)"
 		if [ ! -z "$DUPS" ]; then
 			error "-> You provided a duplicate container entry!"
 			exit 1
 		fi
 		
-		for i in $extracon; do
+		for i in $remuxcon; do
 			echo
 			if [ "$i" = "$CONFMT" ]; then
 				error "-> Additional container $i matches the main output container!"
@@ -649,7 +646,7 @@
 			denoise="atadenoise=$ata_1$ata_2$ata_3,"
 			;;
 			*)
-			error "-> Invalid denoiser option!"
+			error "-> Invalid option!"
 			exit 1
 			;;
 		esac
@@ -1019,23 +1016,23 @@
 				;;
 			esac
 			echo
-			brown " NTSC <-> PAL and NTSC <-> NTSC FPS Conversion"
-			brown " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-			echo " 0 --> 23.976 FPS (24000/1001) to 24 FPS"
-			echo " 1 --> 23.976 FPS (24000/1001) to 25 FPS"
-			echo " 2 --> 23.976 FPS (24000/1001) to 29.970 FPS"
+			brown " FPS Conversion"
+			brown " ~~~~~~~~~~~~~~"
+			echo " 0 --> 23.976 FPS to 24 FPS"
+			echo " 1 --> 23.976 FPS to 25 FPS"
+			echo " 2 --> 23.976 FPS to 29.970 FPS"
 			echo
-			echo " 3 --> 24 FPS to 23.976 FPS (24000/1001)"
+			echo " 3 --> 24 FPS to 23.976 FPS"
 			echo " 4 --> 24 FPS to 25 FPS"
-			echo " 5 --> 24 FPS to 29.970 FPS (30000/1001)"
+			echo " 5 --> 24 FPS to 29.970 FPS"
 			echo
-			echo " 6 --> 25 FPS to 23.976 FPS (24000/1001)"
+			echo " 6 --> 25 FPS to 23.976 FPS"
 			echo " 7 --> 25 FPS to 24 FPS"
-			echo " 8 --> 25 FPS to 29.970 FPS (30000/1001)"
+			echo " 8 --> 25 FPS to 29.970 FPS"
 			echo
-			echo " 9 --> 29.970 FPS (30000/1001) to 23.976 FPS (24000/1001)"
-			echo " 10 -> 29.970 FPS (30000/1001) to 24 FPS"
-			echo " 11 -> 29.970 FPS (30000/1001) to 25 FPS"
+			echo " 9 --> 29.970 FPS to 23.976 FPS"
+			echo " 10 -> 29.970 FPS to 24 FPS"
+			echo " 11 -> 29.970 FPS to 25 FPS"
 			echo
 			printf "Specify the FPS Conversion option [press 'Enter' to skip]: "
 			read fpsopt
@@ -1183,8 +1180,8 @@
 			exit 1
 			;;
 		esac
-		if [ ! -z "$extracon" ]; then
-			for i in $extracon; do
+		if [ ! -z "$remuxcon" ]; then
+			for i in $remuxcon; do
 				case "$i" in
 					mkv|m2ts|mts|ts) true ;;
 					*)
@@ -1327,6 +1324,11 @@
 esac
 
 if [ "$ATRACKS" != "0" ]; then
+	# Making it "global" so I don't have to
+	# worry about adding experimental codecs
+	# support
+	strict="-strict -2"
+	
 	for i in $(eval echo "{1..$ATRACKS}"); do
 		audindex[i]="$(($i-1))"
 		printf "Track $i: Specify the Audio Track to Encode or Copy [default is 0:1]: "
@@ -1388,7 +1390,6 @@
 			abrdef[i]="768"
 			;;
 			truehd)
-			strict="-strict -2"
 			acdc[i]="truehd"
 			ameta[i]="TrueHD"
 			abropts[i]="1000-18000"
@@ -1396,7 +1397,6 @@
 			skiptfs="1"
 			;;
 			dts)
-			strict="-strict -2"
 			acdc[i]="dca"
 			ameta[i]="DTS"
 			abropts[i]="754/1509"
@@ -1432,7 +1432,6 @@
 			abrdef[i]="448"
 			;;
 			flac)
-			test "$CONFMT" = "mp4" && strict="-strict -2"
 			acdc[i]="flac"
 			ameta[i]="FLAC"
 			abropts[i]="0-8"
@@ -1468,7 +1467,7 @@
 		
 		conerror_func() {
 			test -z "${acodec[i]}" && audcodec[i]="ac3" || audcodec[i]="${acodec[i]}"
-			if [ ! -z "$extracon" ]; then
+			if [ ! -z "$remuxcon" ]; then
 				error "-> Additional container $c does not support ${audcodec[i]} audio!"
 			else
 				error "-> The $c container does not support ${audcodec[i]} audio!"
@@ -1480,7 +1479,7 @@
 		
 		# mkv/m2ts/mts/ts are missing from the list since they
 		# support all the audio codecs supported by the script
-		for c in $CONFMT $extracon; do
+		for c in $CONFMT $remuxcon; do
 			case "$c" in
 				mp4)
 				case "${acodec[i]}" in
@@ -2032,10 +2031,10 @@
 fi
 encoder_func $encmode >> "$OUTFILE"
 echo "" >> "$OUTFILE"
-if [ ! -z "$extracon" ]; then
+if [ ! -z "$remuxcon" ]; then
 	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"
-	for i in $extracon; do
+	for i in $remuxcon; do
 		echo "" >> "$OUTFILE"
 		echo "echo" >> "$OUTFILE"
 		echo "green \"-> Remuxing to $i...\"" >> "$OUTFILE"

Changes of Revision 29