diff --git a/makederiv b/makederiv index 921a03a..4093ce5 100755 --- a/makederiv +++ b/makederiv @@ -442,56 +442,47 @@ while [[ "${@}" != "" ]] ; do _add_video_filter "fieldorder=tff" if [ "${FORMULA}" = "hds" ] ; then _add_video_filter "scale=size=hd1080:interl=1" - _add_video_filter "setsar=1/1" _add_video_filter "setdar=16/9" _add_video_filter "fps=fps=ntsc" MIDDLEOPTIONS+=("${MIDDLEOPTIONSXDCAM[@]}") elif [ "${FORMULA}" = "sds" ] ; then _add_video_filter "scale=720:480" _add_video_filter "pad=720:512:0:24" - _add_video_filter "setsar=1/1" _add_video_filter "setdar=4/3" MIDDLEOPTIONS+=("${MIDDLEOPTIONSIMX[@]}") elif [ "${DARRATIO}" = "1.777" -a ! "${CROPDETECT}" = "Y" ] ; then _add_video_filter "scale=size=hd1080:interl=1" - _add_video_filter "setsar=1/1" _add_video_filter "setdar=16/9" _add_video_filter "fps=fps=ntsc" MIDDLEOPTIONS+=("${MIDDLEOPTIONSXDCAM[@]}") elif [ $(echo "scale=3 ; ${DARRATIO} > (16/9)" | bc -l) = 1 ] ; then _add_video_filter "scale=size=hd1080:interl=1:force_original_aspect_ratio=decrease" _add_video_filter "pad=1920:1080:(ow-iw)/2:(oh-ih)/2" - _add_video_filter "setsar=1/1" _add_video_filter "setdar=16/9" _add_video_filter "fps=fps=ntsc" MIDDLEOPTIONS+=("${MIDDLEOPTIONSXDCAM[@]}") elif [ $(echo "scale=3 ; $DARRATIO > (3/2)" | bc -l) = 1 -o "${ADDSLATE}" = "Y" ] ; then _add_video_filter "scale=size=hd1080:interl=1:force_original_aspect_ratio=decrease" _add_video_filter "pad=1920:1080:(ow-iw)/2:(oh-ih)/2" - _add_video_filter "setsar=1/1" _add_video_filter "setdar=16/9" _add_video_filter "fps=fps=ntsc" MIDDLEOPTIONS+=("${MIDDLEOPTIONSXDCAM[@]}") elif [ "${WIDTH}" = "720" -a "${HEIGHT}" = "480" -a $(echo "scale=3 ; ${DARRATIO} < (3/2)" | bc -l) = 1 -a ! "${CROPDETECT}" = "Y" ] ; then _add_video_filter "scale=720:480" _add_video_filter "pad=720:512:0:24" - _add_video_filter "setsar=1/1" _add_video_filter "setdar=4/3" MIDDLEOPTIONS+=("${MIDDLEOPTIONSIMX[@]}") elif [ "${HEIGHT}" -eq "486" -a "${WIDTH}" -eq "720" ] ; then _add_video_filter "crop=720:484:0:0" _add_video_filter "pad=720:512:0:28" - _add_video_filter "setsar=1/1" _add_video_filter "setdar=4/3" MIDDLEOPTIONS+=("${MIDDLEOPTIONSIMX[@]}") elif [ "${HEIGHT}" -eq "512" -a "${WIDTH}" -eq "720" ] ;then - _add_video_filter "setsar=1/1" _add_video_filter "setdar=4/3" MIDDLEOPTIONS+=("${MIDDLEOPTIONSIMX[@]}") else _add_video_filter "scale=720:480" _add_video_filter "pad=720:512:0:24" - _add_video_filter "setsar=1/1" _add_video_filter "setdar=4/3" MIDDLEOPTIONS+=("${MIDDLEOPTIONSIMX[@]}") fi