Packman Build Service PMBS

ffxvid.changes Changed

ffxvid.spec Changed

ffxvid-1.8.9.tar.gz/ChangeLog -> ffxvid-1.8.10.tar.gz/ChangeLog Changed

ffxvid-1.8.9.tar.gz/ffxvid -> ffxvid-1.8.10.tar.gz/ffxvid Changed

@@ -2,8 +2,8 @@
 #
 # Small script to encode to Xvid video using FFmpeg.
 # Author: Grozdan "microchip" Nikolov <neutrino8@gmail.com>
-# Version: 1.8.9
-# Date: 2024-11-18
+# Version: 1.8.10
+# Date: 2024-11-21
 #
 # 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,10 +24,10 @@
 brown() { echo -e "\e0;33m$1\e0;39;49m"; }
 error() { echo -e "\e1;31m$1\e0;39;49m"; }
 
-version="1.8.9"
+version="1.8.10"
 
 CFG="$HOME/.ffxvid"
-cfgversion="15"
+cfgversion="16"
 
 genconfig_func() {
 cat<<EOF>>"$CFG"
@@ -110,7 +110,11 @@
 SUBS="y"
 
 # Copy original metadata from input?
-METADATA="n"
+COPY_METADATA="n"
+
+# Add automatic metadata such as video
+# title, audio codec names, etc?
+AUTO_METADATA="y"
 
 # Copy chapters from input?
 CHAPS="y"
@@ -536,7 +540,9 @@
 	FORLOOP_END="done"
 fi
 
-METATITLE="-metadata title=\"$(basename "${OUTPUT%.*}")\" -metadata:s:v:0 title=\"$(basename "${OUTPUT%.*}")\""
+if  "$AUTO_METADATA" = "y" ; then
+	METATITLE="-metadata title=\"$(basename "${OUTPUT%.*}")\" -metadata:s:v:0 title=\"$(basename "${OUTPUT%.*}")\""
+fi
 
 printf "Output to Additional Container Formats? y/N: "
 read acf
@@ -2246,30 +2252,32 @@
 	# support
 	strict="-strict -2"
 	
-	if  ! -z "$batchmode" ; then
-		echo
-		error "-> Due to current codebase limitations, automatic audio metadata"
-		error "   will be that of the first provided input file. If all input files"
-		error "   have the same audio properties (bit depth, sample rate, etc)"
-		error "   this won't be an issue. Usually, complete seasons of film series"
-		error "   have the same audio properties."
-		error "   Otherwise you may want to:"
-		echo
-		error "-> Disable auto metadata completely"
-		echo
-		error "-> Enable it but you will need to modify the batchfile yourself and"
-		error "   update the data to reflect the correct audio properties. Then"
-		error "   encode from there."
-		echo
-		error "-> Encode each file individually (no batch mode). That way, you'll"
-		error "   have correct audio metadata for all files."
-		echo
-		printf "Disable Automatic Audio Metadata? y/N: "
-		read noautometa
-		if  "$noautometa" = "y" -o "$noautometa" = "Y" ; then
-			noaudmeta="1"
+	if  "$AUTO_METADATA" = "y" ; then
+		if  ! -z "$batchmode" ; then
+			echo
+			error "-> Due to current codebase limitations, automatic audio metadata"
+			error "   will be that of the first provided input file. If all input files"
+			error "   have the same audio properties (bit depth, sample rate, etc)"
+			error "   this won't be an issue. Usually, complete seasons of film series"
+			error "   have the same audio properties."
+			error "   Otherwise you may want to:"
+			echo
+			error "-> Disable auto metadata completely"
+			echo
+			error "-> Enable it but you will need to modify the batchfile yourself and"
+			error "   update the data to reflect the correct audio properties. Then"
+			error "   encode from there."
+			echo
+			error "-> Encode each file individually (no batch mode). That way, you'll"
+			error "   have correct audio metadata for all files."
+			echo
+			printf "Disable Automatic Audio Metadata? y/N: "
+			read noautometa
+			if  "$noautometa" = "y" -o "$noautometa" = "Y" ; then
+				noaudmeta="1"
+			fi
+			echo
 		fi
-		echo
 	fi
 	
 	for i in $(eval echo "{1..$ATRACKS}"); do
@@ -3234,7 +3242,10 @@
 				esac
 			fi
 			
-			audmetai="-metadata:s:a:${audindexi} title=\"${acdcmetai}${achmetai}${abtrmetai}${ahzmetai}${abdmetai}\""
+			if  "$AUTO_METADATA" = "y" ; then
+				audmetai="-metadata:s:a:${audindexi} title=\"${acdcmetai}${achmetai}${abtrmetai}${ahzmetai}${abdmetai}\""
+			fi
+			
 			audchani="-ac:${audindexi} ${achi} -channel_layout:a:${audindexi} \"${achlayouti}\""
 			
 			afiltersi="$(echo "${aresamplei}${anormalizei}${avolumei}$atempo" | sed 's|,$||')"
@@ -3387,7 +3398,7 @@
 			fi
 		fi
 		
-		if  -z "$noaudmeta" ; then
+		if  -z "$noaudmeta" -a "$AUTO_METADATA" = "y" ; then
 			audmetadatai="${audmetai}"
 		fi
 		
@@ -3501,7 +3512,7 @@
 	input="\$i"
 fi
 
-test "$METADATA" = "n" && METADATA="-map_metadata -1" || METADATA="-map_metadata 0"
+test "$COPY_METADATA" = "n" && METADATA="-map_metadata -1" || METADATA="-map_metadata 0"
 
 test "$CHAPS" = "n" && CHAPS="-map_chapters -1" || CHAPS="-map_chapters 0"

Changes of Revision 111