Packman Build Service PMBS

ffxvid.changes Changed

ffxvid.spec Changed

ffxvid-1.5.1.tar.gz/ChangeLog -> ffxvid-1.5.2.tar.gz/ChangeLog Changed

ffxvid-1.5.1.tar.gz/ffxvid -> ffxvid-1.5.2.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.5.1
-# Date: 2019-10-21
+# Version: 1.5.2
+# Date: 2019-10-22
 #
 # 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.5.1"
+version="1.5.2"
 
 CFG="$HOME/.ffxvid"
 cfgversion="14"
@@ -498,10 +498,10 @@
 
 if [ "$LOG" = "y" ]; then
 	if [ -z "$batchmode" ]; then
-		export FFREPORT="level=40:file=$(echo "${OUTPUT%.*}_verbose.log" | sed 's| |_|g')"
+		export FFREPORT="level=40:file=$(echo "${OUTPUT%.*}_verbose$$.log" | sed 's| |_|g')"
 	else
 		verbose_func() {
-			echo "export FFREPORT=\"level=40:file=\$(echo \"$(dirname "$OUTPUT")/\${i%.*}_verbose.log\" | sed 's| |_|g')\""
+			echo "export FFREPORT=\"level=40:file=\$(echo \"$(dirname "$OUTPUT")/\${i%.*}_verbose$$.log\" | sed 's| |_|g')\""
 		}
 	fi
 	verbose="-v verbose"
@@ -1212,91 +1212,71 @@
 			case "$csopt" in
 				1)
 				cspace="iall=bt470m:ispace=bt470m:itrc=bt470m:iprimaries=bt470m:irange=$irange:all=smpte170m:space=smpte170m:trc=smpte170m:primaries=smpte170m:range=$orange:dither=fsb"
-				colorprim=":colormatrix=smpte170m:colorprim=smpte170m:transfer=smpte170m"
 				;;
 				2)
 				cspace="iall=bt470m:ispace=bt470m:itrc=bt470m:iprimaries=bt470m:irange=$irange:all=bt470bg:space=bt470bg:trc=bt470bg:primaries=bt470bg:range=$orange:dither=fsb"
-				colorprim=":colormatrix=bt470bg:colorprim=bt470bg:transfer=bt470bg"
 				;;
 				3)
 				cspace="iall=bt470m:ispace=bt470m:itrc=bt470m:iprimaries=bt470m:irange=$irange:all=bt709:space=bt709:trc=bt709:primaries=bt709:range=$orange:dither=fsb"
-				colorprim=":colormatrix=bt709:colorprim=bt709:transfer=bt709"
 				;;
 				4)
 				video_csmisc_func
 				cspace="iall=bt470m:ispace=bt470m:itrc=bt470m:iprimaries=bt470m:irange=$irange:all=bt2020:space=bt2020ncl:trc=bt2020$bd:primaries=bt2020:range=$orange:dither=fsb"
-				colorprim=":colormatrix=bt2020$cm:colorprim=bt2020:transfer=bt2020$bd"
 				;;
 				5)
 				cspace="iall=smpte170m:ispace=smpte170m:itrc=smpte170m:iprimaries=smpte170m:irange=$irange:all=bt470m:space=bt470m:trc=bt470m:primaries=bt470m:range=$orange:dither=fsb"
-				colorprim=":colormatrix=bt470m:colorprim=bt470m:transfer=bt470m"
 				;;
 				6)
 				cspace="iall=smpte170m:ispace=smpte170m:itrc=smpte170m:iprimaries=smpte170m:irange=$irange:all=bt470bg:space=bt470bg:trc=bt470bg:primaries=bt470bg:range=$orange:dither=fsb"
-				colorprim=":colormatrix=bt470bg:colorprim=bt470bg:transfer=bt470bg"
 				;;
 				7)
 				cspace="iall=smpte170m:ispace=smpte170m:itrc=smpte170m:iprimaries=smpte170m:irange=$irange:all=bt709:space=bt709:trc=bt709:primaries=bt709:range=$orange:dither=fsb"
-				colorprim=":colormatrix=bt709:colorprim=bt709:transfer=bt709"
 				;;
 				8)
 				video_csmisc_func
 				cspace="iall=smpte170m:ispace=smpte170m:itrc=smpte170m:iprimaries=smpte170m:irange=$irange:all=bt2020:space=bt2020ncl:trc=bt2020$bd:primaries=bt2020:range=$orange:dither=fsb"
-				colorprim=":colormatrix=bt2020$cm:colorprim=bt2020:transfer=bt2020$bd"
 				;;
 				9)
 				cspace="iall=bt470bg:ispace=bt470bg:itrc=bt470bg:iprimaries=bt470bg:irange=$irange:all=bt470m:space=bt470m:trc=bt470m:primaries=bt470m:range=$orange:dither=fsb"
-				colorprim=":colormatrix=bt470m:colorprim=bt470m:transfer=bt470m"
 				;;
 				10)
 				cspace="iall=bt470bg:ispace=bt470bg:itrc=bt470bg:iprimaries=bt470bg:irange=$irange:all=smpte170m:space=smpte170m:trc=smpte170m:primaries=smpte170m:range=$orange:dither=fsb"
-				colorprim=":colormatrix=smpte170m:colorprim=smpte170m:transfer=smpte170m"
 				;;
 				11)
 				cspace="iall=bt470bg:ispace=bt470bg:itrc=bt470bg:iprimaries=bt470bg:irange=$irange:all=bt709:space=bt709:trc=bt709:primaries=bt709:range=$orange:dither=fsb"
-				colorprim=":colormatrix=bt709:colorprim=bt709:transfer=bt709"
 				;;
 				12)
 				video_csmisc_func
 				cspace="iall=bt470bg:ispace=bt470bg:itrc=bt470bg:iprimaries=bt470bg:irange=$irange:all=bt2020:space=bt2020ncl:trc=bt2020$bd:primaries=bt2020:range=$orange:dither=fsb"
-				colorprim=":colormatrix=bt2020$cm:colorprim=bt2020:transfer=bt2020$bd"
 				;;
 				13)
 				cspace="iall=bt709:ispace=bt709:itrc=bt709:iprimaries=bt709:irange=$irange:all=bt470m:space=bt470m:trc=bt470m:primaries=bt470m:range=$orange:dither=fsb"
-				colorprim=":colormatrix=bt470m:colorprim=bt470m:transfer=bt470m"
 				;;
 				14)
 				cspace="iall=bt709:ispace=bt709:itrc=bt709:iprimaries=bt709:irange=$irange:all=smpte170m:space=smpte170m:trc=smpte170m:primaries=smpte170m:range=$orange:dither=fsb"
-				colorprim=":colormatrix=smpte170m:colorprim=smpte170m:transfer=smpte170m"
 				;;
 				15)
 				cspace="iall=bt709:ispace=bt709:itrc=bt709:iprimaries=bt709:irange=$irange:all=bt470bg:space=bt470bg:trc=bt470bg:primaries=bt470bg:range=$orange:dither=fsb"
-				colorprim=":colormatrix=bt470bg:colorprim=bt470bg:transfer=bt470bg"
 				;;
 				16)
 				video_csmisc_func
 				cspace="iall=bt709:ispace=bt709:itrc=bt709:iprimaries=bt709:irange=$irange:all=bt2020:space=bt2020ncl:trc=bt2020$bd:primaries=bt2020:range=$orange:dither=fsb"
-				colorprim=":colormatrix=bt2020$cm:colorprim=bt2020:transfer=bt2020$bd"
 				;;
 				17)
 				video_csmisc_func
 				cspace="iall=bt2020:ispace=bt2020ncl:itrc=bt2020$bd:iprimaries=bt2020:irange=$irange:all=bt470m:space=bt470m:trc=bt470m:primaries=bt470m:range=$orange:dither=fsb"
-				colorprim=":colormatrix=bt470m:colorprim=bt470m:transfer=bt470m"
 				;;
 				18)
 				video_csmisc_func
 				cspace="iall=bt2020:ispace=bt2020ncl:itrc=bt2020$bd:iprimaries=bt2020:irange=$irange:all=smpte170m:space=smpte170m:trc=smpte170m:primaries=smpte170m:range=$orange:dither=fsb"
-				colorprim=":colormatrix=smpte170m:colorprim=smpte170m:transfer=smpte170m"
 				;;
 				19)
 				video_csmisc_func
 				cspace="iall=bt2020:ispace=bt2020ncl:itrc=bt2020$bd:iprimaries=bt2020:irange=$irange:all=bt470bg:space=bt470bg:trc=bt470bg:primaries=bt470bg:range=$orange:dither=fsb"
-				colorprim=":colormatrix=bt470bg:colorprim=bt470bg:transfer=bt470bg"
 				;;
 				20)
 				video_csmisc_func
 				cspace="iall=bt2020:ispace=bt2020ncl:itrc=bt2020$bd:iprimaries=bt2020:irange=$irange:all=bt709:space=bt709:trc=bt709:primaries=bt709:range=$orange:dither=fsb"
-				colorprim=":colormatrix=bt709:colorprim=bt709:transfer=bt709"
 				;;
 				"") true ;;
 				*)
@@ -1870,10 +1850,10 @@
 			;;
 		esac
 		case "$CONFMT" in
-			mkv|mp4|m4v) true ;;
+			mkv|mp4|m4v|mov) true ;;
 			*)
 			error "-> The $CONFMT container doesn't support SRT/SSA/ASS subtitles!"
-			error "-> Supported containers are: mkv, mp4, m4v, m2ts, mts and ts"
+			error "-> Supported containers are: mkv, mp4, m4v, mov, m2ts, mts and ts"
 			exit 1
 			;;
 		esac
@@ -1891,8 +1871,8 @@
 					# as default.
 					test "$i" = "1" && sdis="default" || sdis="none"
 					case "$CONFMT" in
-						mp4|m4v)		submuxer_in="mov_text" ;;
-						*)			submuxer_in="copy" ;;
+						mp4|m4v|mov)	submuxer_in="mov_text" ;;
+						*)		submuxer_in="copy" ;;
 					esac
 					subcopy[i]="-map ${subnr[i]} -c:s:${subindex[i]} $submuxer_in ${sublang[i]} -disposition:s:${subindex[i]} $sdis"
 				else
@@ -1915,7 +1895,7 @@
 		if [ ! -z "$remuxcon" ]; then
 			for i in $remuxcon; do
 				case "$i" in
-					mkv|mp4|m4v) true ;;
+					mkv|mp4|m4v|mov) true ;;
 					*)
 					echo
 					error "-> Warning: One or more chosen additional container"
@@ -1956,8 +1936,8 @@
 						test "$i" = "1" && sdispo="default" || sdispo="none"
 					fi
 					case "$CONFMT" in
-						mp4|m4v)		submuxer_ext="mov_text" ;;
-						*)			submuxer_ext="copy" ;;
+						mp4|m4v|mov)	submuxer_ext="mov_text" ;;
+						*)		submuxer_ext="copy" ;;
 					esac
 					EXTSUBS[i]="-i \"$(readlink -e "${subfile[i]}")\""
 					subcpy[i]="-map $i:0 -c:s:${subidx[i]} $submuxer_ext ${sublng[i]} -disposition:s:${subidx[i]} $sdispo"
@@ -3248,13 +3228,16 @@
 		echo "fi" >> "$OUTFILE"
 		echo "echo" >> "$OUTFILE"
 		echo "" >> "$OUTFILE"
+		COVER="1"
 	fi
 	;;
 esac
 if [ ! -z "$remuxcon" ]; then
 	for i in $remuxcon; do
-		echo "" >> "$OUTFILE"
-		echo "echo" >> "$OUTFILE"
+		if [ -z "$COVER" ]; then
+			echo "" >> "$OUTFILE"
+			echo "echo" >> "$OUTFILE"
+		fi
 		echo "green \"-> Remuxing to $i...\"" >> "$OUTFILE"
 		case "$i" in
 			wmv)	vflags="-fflags +genpts"; MKVCOVER2="" ;;
@@ -3268,11 +3251,11 @@
 		esac
 		if [ "$subparams" != "-sn" ]; then
 			case "$i" in
-				mp4|m4v)	suboption="-c:s mov_text" ;;
-				mov|avi|wmv)	suboption="-sn" ;;
+				mp4|m4v|mov)	suboption="-c:s mov_text" ;;
+				avi|wmv)	suboption="-sn" ;;
 				*)
 				case "$(basename "${OUTPUT##*.}")" in
-					mp4|m4v)	suboption="-c:s srt" ;;
+					mp4|m4v|mov)	suboption="-c:s srt" ;;
 					*)		suboption="-c:s copy" ;;
 				esac
 				;;

Changes of Revision 69