Packman Build Service PMBS

ffxvid.changes Changed

ffxvid.spec Changed

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

ffxvid-1.3.5.tar.gz/ffxvid -> ffxvid-1.3.6.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.5
-# Date: 2019-09-18
+# Version: 1.3.6
+# Date: 2019-09-19
 #
 # 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.5"
+version="1.3.6"
 
 CFG="$HOME/.ffxvid"
 cfgversion="9"
@@ -487,7 +487,7 @@
 			esac
 			case "$1" in
 				mov) 		green "-> ac3|eac3|dts|aac|fdk-aac|mp3|vorbis|alac|copy" ;;
-				avi)		green "-> ac3|dts|aac|fdk-aac|mp3|vorbis|pcm|flac|copy" ;;
+				avi)		green "-> ac3|dts|aac|fdk-aac|mp3|vorbis|wmav1|wmav2|pcm|flac|copy" ;;
 				other)
 				error "-> Xvid video not supported by the $i container!"
 				error "-> Supported containers are: avi, mov, mkv"
@@ -928,11 +928,11 @@
 		read pixopt
 		case "$pixopt" in
 			0|"")	pixfmt="yuv420p" ;;
-			1)	pixfmt="yuv420p10" ;;
+			1)	pixfmt="yuv420p10le" ;;
 			2)	pixfmt="yuv422p" ;;
-			3)	pixfmt="yuv422p10" ;;
+			3)	pixfmt="yuv422p10le" ;;
 			4)	pixfmt="yuv444p" ;;
-			5)	pixfmt="yuv444p10" ;;
+			5)	pixfmt="yuv444p10le" ;;
 			*)
 			error "-> Invalid option!"
 			exit 1
@@ -1988,6 +1988,8 @@
 		echo " Opus ----> Channels Support: 2"
 		echo " Vorbis --> Channels Support: 8"
 		echo " MP3 -----> Channels Support: 2"
+		echo " WMAv1 ---> Channels Support: 2"
+		echo " WMAv2 ---> Channels Support: 2"
 		echo " TrueHD --> Channels Support: 6"
 		echo " FLAC ----> Channels Support: 8"
 		echo " ALAC ----> Channels Support: 8"
@@ -2074,6 +2076,18 @@
 			abropts[i]="6-500"
 			abrdef[i]="448"
 			;;
+			wmav1)
+			acdc[i]="wmav1"
+			ameta[i]="WMAv1"
+			abropts[i]="64-320"
+			abrdef[i]="192"
+			;;
+			wmav2)
+			acdc[i]="wmav2"
+			ameta[i]="WMAv2"
+			abropts[i]="64-320"
+			abrdef[i]="192"
+			;;
 			flac)
 			acdc[i]="flac"
 			ameta[i]="FLAC"
@@ -2133,7 +2147,7 @@
 			case "$c" in
 				mov)
 				case "${acodec[i]}" in
-					pcm|libopus|opus|truehd|flac) conerror_func ;;
+					pcm|libopus|opus|wmav1|wmav2|truehd|flac) conerror_func ;;
 				esac
 				;;
 				avi)
@@ -2185,7 +2199,7 @@
 			esac
 			
 			case "${acodec[i]}" in
-				ac3|eac3|truehd|dts|aac|fdk*|mp3|vorbis|libopus|opus|"")
+				ac3|eac3|truehd|dts|aac|fdk*|mp3|vorbis|libopus|opus|wmav1|wmav2|"")
 				printf "Track $i: Specify the Audio Bitrate in kbps [${abropts[i]} - default is ${abrdef[i]}]: "
 				read abr[i]
 				test -z "${abr[i]}" && abitrate[i]="${abrdef[i]}k" || abitrate[i]="${abr[i]}k"
@@ -2197,7 +2211,7 @@
 			case "${acodec[i]}" in
 				ac3|eac3|"")				chanrange[i]="1-6"; defchan[i]="6" ;;
 				aac|libopus|vorbis|flac|alac|pcm)	chanrange[i]="1-8"; defchan[i]="8" ;;
-				mp3|opus)				chanrange[i]="1-2"; defchan[i]="2" ;;
+				mp3|opus|wmav1|wmav2)			chanrange[i]="1-2"; defchan[i]="2" ;;
 				truehd)					chanrange[i]="2/5/6"; defchan[i]="6" ;;
 				dts)					chanrange[i]="1/2/4/5/6"; defchan[i]="6" ;;
 				fdk*)
@@ -2264,7 +2278,7 @@
 					;;
 				esac
 				;;
-				mp3|opus)
+				mp3|opus|wmav1|wmav2)
 				case "${ach[i]}" in
 					1|2) true ;;
 					*)
@@ -2273,6 +2287,10 @@
 						error "-> MP3 supports only 1-2 channels!"
 						exit 1
 						;;
+						wmav1|wmav2)
+						error "-> WMAv1/WMAv2 support only 1-2 channels!"
+						exit 1
+						;;
 						opus)
 						error "-> Internal Opus encoder supports only 1-2 channels!"
 						exit 1
@@ -2435,7 +2453,7 @@
 					;;
 				esac
 				;;
-				mp3|opus)
+				mp3|opus|wmav1|wmav2)
 				echo " 0 -> Mono"
 				echo " 1 -> Stereo"
 				echo
@@ -2634,7 +2652,7 @@
 							;;
 						esac
 						;;
-						mp3|dts)
+						mp3|dts|wmav1|wmav2)
 						echo " 0 -> 8000 Hz     5 -> 24000 Hz"
 						echo " 1 -> 11025 Hz    6 -> 32000 Hz"
 						echo " 2 -> 12000 Hz    7 -> 44100 Hz"
@@ -2842,7 +2860,8 @@
 					;;
 					mp3)	GETAUDCDC[i]="MP3" ;;
 					mp2)	GETAUDCDC[i]="MP2" ;;
-					wma*)	GETAUDCDC[i]="WMA" ;;
+					wmav1)	GETAUDCDC[i]="WMAv1" ;;
+					wmav2)	GETAUDCDC[i]="WMAv2" ;;
 					opus)	GETAUDCDC[i]="Opus" ;;
 					pcm*)	GETAUDCDC[i]="PCM" ;;
 					flac)	GETAUDCDC[i]="FLAC" ;;

Changes of Revision 45