Packman Build Service PMBS

ffxvid.changes Changed

ffxvid.spec Changed

ffxvid-1.3.4.tar.gz/ChangeLog -> ffxvid-1.3.5.tar.gz/ChangeLog Changed

ffxvid-1.3.4.tar.gz/ffxvid -> ffxvid-1.3.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.3.4
-# Date: 2019-09-13
+# Version: 1.3.5
+# Date: 2019-09-18
 #
 # 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.3.4"
+version="1.3.5"
 
 CFG="$HOME/.ffxvid"
 cfgversion="9"
@@ -2808,18 +2808,34 @@
 			aindex[i]="$(($(echo "${atrack[i]}" | awk -F: '{print $2}')-1))"
 			test "${aindex[i]}" = "-1" && aindex[i]="0"
 			
-			GETAUDCDC[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aindex[i]} -show_streams -of default=noprint_wrappers=1 | grep '^codec_name' | awk -F= '{print $2}' | tr '[a-z]' '[A-Z]')"
+			GETAUDCDC[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aindex[i]} -show_streams -of default=noprint_wrappers=1 | grep '^codec_name' | awk -F= '{print $2}')"
 			GETAUDBTR[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aindex[i]} -show_streams -of default=noprint_wrappers=1 | grep '^bit_rate' | awk -F= '{print $2}')"
 			GETAUDSR[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aindex[i]} -show_streams -of default=noprint_wrappers=1 | grep '^sample_rate' | awk -F= '{print $2}')"
-			GETAUDCH[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aindex[i]} -show_streams -of default=noprint_wrappers=1 | grep '^channel_layout' | awk -F= '{print $2}')"
+			GETAUDCL[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aindex[i]} -show_streams -of default=noprint_wrappers=1 | grep '^channel_layout' | awk -F= '{print $2}')"
 			
 			if [ ! -z "${GETAUDCDC[i]}" ]; then
+				case "${GETAUDCDC[i]}" in
+					ac3)	GETAUDCDC[i]="AC-3" ;;
+					eac3)	GETAUDCDC[i]="E-AC-3" ;;
+					truehd)	GETAUDCDC[i]="TrueHD" ;;
+					dts)	GETAUDCDC[i]="DTS" ;;
+					vorbis)	GETAUDCDC[i]="Vorbis" ;;
+					aac)	GETAUDCDC[i]="AAC" ;;
+					mp3)	GETAUDCDC[i]="MP3" ;;
+					mp2)	GETAUDCDC[i]="MP2" ;;
+					wma*)	GETAUDCDC[i]="WMA" ;;
+					opus)	GETAUDCDC[i]="Opus" ;;
+					pcm*)	GETAUDCDC[i]="PCM" ;;
+					flac)	GETAUDCDC[i]="FLAC" ;;
+					alac)	GETAUDCDC[i]="ALAC" ;;
+					*)	GETAUDCDC[i]="$(echo "${GETAUDCDC[i]}" | tr '[a-z]' '[A-Z]')" ;;
+				esac
 				case "${GETAUDCH[i]}" in
 					[1-9]*|mono|stereo)
-					case "${GETAUDCH[i]}" in
+					case "${GETAUDCL[i]}" in
 						mono)	audchmeta[i]=" Mono" ;;
 						stereo)	audchmeta[i]=" Stereo" ;;
-						*)	audchmeta[i]=" $(echo "${GETAUDCH[i]}" | sed 's|(.*||g')" ;;
+						*)	audchmeta[i]=" $(echo "${GETAUDCL[i]}" | sed 's|(.*||g')" ;;
 					esac
 					;;
 				esac

Changes of Revision 40