Packman Build Service PMBS

ffxvid.changes Changed

ffxvid.spec Changed

ffxvid-1.1.7.tar.gz/ChangeLog -> ffxvid-1.1.8.tar.gz/ChangeLog Changed

ffxvid-1.1.7.tar.gz/ffxvid -> ffxvid-1.1.8.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.7
-# Date: 2017-06-14
+# Version: 1.1.8
+# Date: 2017-06-20
 #
 # 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.7"
+version="1.1.8"
 
 CFG="$HOME/.ffxvid"
 cfgversion="7"
@@ -363,7 +363,9 @@
 	exit 1
 fi
 
-input="$(readlink -f "$input")"
+if [ -z "$batchmode" ]; then
+	input="$(readlink -f "$input")"
+fi
 
 if [ ! -z "$batchmode" ]; then
 	OUTPUT="$OUTDIR/$(basename $0)_$$"
@@ -375,14 +377,14 @@
 			error "-> Could not create the output directory!"
 			exit 1
 		fi
-		OUTPUT="$(readlink -f "$OUTPUT/\${i%.*}")"
+		OUTPUT="$(realpath -s "$OUTPUT/\${i%.*}")"
 	else
 		mkdir -p "$output" 2>/dev/null
 		if [ $? != 0 ]; then
 			error "-> Could not create the output directory!"
 			exit 1
 		fi
-		OUTPUT="$(readlink -f "$output/\${i%.*}")"
+		OUTPUT="$(realpath -s "$output/\${i%.*}")"
 	fi
 else
 	printf "Specify a Name for the Output: "
@@ -423,17 +425,15 @@
 
 OUTPUT="$OUTPUT.$CONFMT"
 
-if [ -x "$(which realpath 2>/dev/null)" ]; then
-	if [ ! -z "$batchmode" ]; then
-		if [ "$(realpath -s "$(dirname "$input")")" = "$(realpath -s "$(dirname "$OUTPUT")")" ]; then
-			error "-> Input directory matches output directory!"
-			exit 1
-		fi
-	else
-		if [ "$(realpath -s "$input")" = "$(realpath -s "$OUTPUT")" ]; then
-			error "-> Input file matches output file!"
-			exit 1
-		fi
+if [ ! -z "$batchmode" ]; then
+	if [ "$(realpath -s "$(dirname "$input")")" = "$(realpath -s "$(dirname "$OUTPUT")")" ]; then
+		error "-> Input directory matches output directory!"
+		exit 1
+	fi
+else
+	if [ "$(realpath -s "$input")" = "$(realpath -s "$OUTPUT")" ]; then
+		error "-> Input file matches output file!"
+		exit 1
 	fi
 fi
 
@@ -1140,7 +1140,9 @@
 	HEIGHT="$($FFPROBE -i "$input" -v error -select_streams v:0 -show_entries stream=height -of default=noprint_wrappers=1:nokey=1 | tail -1)"
 	if [ ! -z "$crop" ]; then
 		green "-> Original resolution: ${WIDTH}x${HEIGHT}"
-		green "-> Cropped resolution:  $(echo "$crop" | sed 's|crop=||' | awk -F: '{print $1}')x$(echo "$crop" | awk -F: '{print $2}')"
+		if [ -z "$batchmode" ]; then
+			green "-> Cropped resolution:  $(echo "$crop" | sed 's|crop=||' | awk -F: '{print $1}')x$(echo "$crop" | awk -F: '{print $2}')"
+		fi
 	else
 		green "-> Detected ${WIDTH}x${HEIGHT}"
 	fi

Changes of Revision 18