Packman Build Service PMBS

Changes of Revision 19

ffx264-3.1.7.tar.gz/ffx264 Changed

@@ -1904,26 +1904,24 @@
 test ! -z "$COMMENT" && METACOMMENT="-metadata comment=\"$COMMENT\""
 
 encoder_func() {
+	OPTS1="${EXTSUBS[*]} -map 0:0 -disposition:v:0 default $ofps $annexb $NOSUBS $MDATA $CHPS $METATITLE $METAGENRE $METAYEAR $METACOMMENT $vfilters $sws"
 	case "$1" in
 		1p|crf)
 		test "$encmode" = "1p" && pmode="bitrate=$vbitrate" || pmode="crf=$CRF"
-		OPTS1="${EXTSUBS[*]} -map 0:0 -disposition:v:0 default $ofps $annexb $NOSUBS $MDATA $CHPS $METATITLE $METAGENRE $METAYEAR $METACOMMENT $vfilters $sws"
 		OPTS2="${audparams[*]} ${auddis[*]} ${subcopy[*]} ${subcpy[*]} ${subdis[*]} ${subdispo[*]} $strict $movflags $METACOVER \"$OUTPUT\""
 		;;
 		2p)
 		passone="stats=\"${OUTFILE%.*}.log\":pass=1:bitrate=$vbitrate"
 		passtwo="stats=\"${OUTFILE%.*}.log\":pass=2:bitrate=$vbitrate"
-		OPTS1="-map 0:0"
 		OPTS2="-an -f null -y /dev/null"
-		OPTS3="${EXTSUBS[*]} -map 0:0 -disposition:v:0 default $ofps $annexb $NOSUBS $MDATA $CHPS $METATITLE $METAGENRE $METAYEAR $METACOMMENT $vfilters $sws"
-		OPTS4="${audparams[*]} ${auddis[*]} ${subcopy[*]} ${subcpy[*]} ${subdis[*]} ${subdispo[*]} $strict $movflags $METACOVER \"$OUTPUT\""
+		OPTS3="${audparams[*]} ${auddis[*]} ${subcopy[*]} ${subcpy[*]} ${subdis[*]} ${subdispo[*]} $strict $movflags $METACOVER \"$OUTPUT\""
 		;;
 	esac
 	echo "nice -n $NICE $FFMPEG -i \"$input\" $OPTS1 -c:v libx264 -x264opts $pmode$passone$X264PARAMS $OPTS2"
 	case "$1" in
 		2p)
 		echo
-		echo "nice -n $NICE $FFMPEG -i \"$input\" $OPTS3 -c:v libx264 -x264opts $passtwo$X264PARAMS $OPTS4"
+		echo "nice -n $NICE $FFMPEG -i \"$input\" $OPTS1 -c:v libx264 -x264opts $passtwo$X264PARAMS $OPTS3"
 		;;
 	esac
 }