summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2014-09-26 22:08:11 +0200
committerJonas Smedegaard <dr@jones.dk>2014-09-26 22:08:11 +0200
commit16e2afb1ae833e6dd63323705d24b4d6046772bf (patch)
treea948e6e9274ca65712f5094c2c29173e5e5d3990
parenta0aae6be56c2291dd6cd53ea0efdcda8c4232d61 (diff)
Tidy: Drop obsolete $_melt_out and custom $_melt_in.
-rwxr-xr-xlocalvideowebencode14
1 files changed, 7 insertions, 7 deletions
diff --git a/localvideowebencode b/localvideowebencode
index 48c91f2..c2695af 100755
--- a/localvideowebencode
+++ b/localvideowebencode
@@ -327,7 +327,7 @@ esac
# TODO: When verified beneficial, add option real_time=-2
melt="melt -progress"
-_melt_in="${_melt_in:+$_melt_in }${sample:+in=${samplestart:-0} out=$((${samplestart:-0} + samplelength))}"
+_melt_in="${sample:+in=${samplestart:-0} out=$((${samplestart:-0} + samplelength))}"
_melt_video="progressive=1${framerate:+ frame_rate_den="$framerate_den" frame_rate_num="$framerate_num"}${size:+ s=${width:+$width}x${height:+$height}}${aspect:+ aspect=$aspect}"
_melt_ogg="$_melt_video f=ogg vcodec=libtheora${bitrate:+ vb=$bitrate}${bitrate_fixed:- qscale=5}"
_melt_h264="$_melt_video f=mp4 vcodec=libx264 vpre=medium vprofile=baseline${x264tune:+ tune=$x264tune}${bitrate_fixed:+ vb=$bitrate} threads=0 movflags=+faststart${bitrate_fixed:- crf=23}"
@@ -358,7 +358,7 @@ fi
if [ -n "$mp4" ] && [ -n "$bitrate_fixed" ]; then
echo "Analyzing complexity for MPEG-4..."
$melt -group $_melt_in $infiles -group $filters \
- -consumer avformat:/dev/null pass=1 fastfirstpass=1 an=1 audio_off=1 $_melt_h264 $_melt_out
+ -consumer avformat:/dev/null pass=1 fastfirstpass=1 an=1 audio_off=1 $_melt_h264
fi
echo "Analyzing complexity for WebM..."
@@ -376,10 +376,10 @@ $melt -group $_melt_in $infiles \
echo "Encoding video..."
-group ${channels:+$audioprefilters${_melt_loudness:+ -filter loudness results="$_melt_loudness"}} \
$filters${channels:+ $_melt_postfilters_audio} \
- ${ogg:+-consumer avformat:$stem.ogv $_melt_ogg $_melt_vorbis $_melt_out} \
- ${mp4:+-consumer avformat:$stem.mp4${bitrate_fixed:+ pass=2} $_melt_h264 $_melt_aac $_melt_out} \
- ${webm:+-consumer avformat:$stem.webm $_melt_webm$ pass=2 passlogfile=${stem}_vp8 $_melt_vorbis $_melt_out} \
- ${vp9:+-consumer avformat:${stem}_vp9.webm pass=2 passlogfile=${stem}_vp9 $_melt_vp9 $_melt_opus $_melt_out}
+ ${ogg:+-consumer avformat:$stem.ogv $_melt_ogg $_melt_vorbis} \
+ ${mp4:+-consumer avformat:$stem.mp4${bitrate_fixed:+ pass=2} $_melt_h264 $_melt_aac} \
+ ${webm:+-consumer avformat:$stem.webm $_melt_webm$ pass=2 passlogfile=${stem}_vp8 $_melt_vorbis} \
+ ${vp9:+-consumer avformat:${stem}_vp9.webm pass=2 passlogfile=${stem}_vp9 $_melt_vp9 $_melt_opus}
if [ -n "$mp4" ] && [ -z "$melt_recent" ]; then
mv "$stem.mp4" "$stem.mp4"~
@@ -393,7 +393,7 @@ rm -f $stem.xml
## JPEG preview
$melt -group in=0 out=0 $infiles \
-group $filters \
- -consumer avformat:$stem.jpg $_melt_img $_melt_out
+ -consumer avformat:$stem.jpg $_melt_img
__width="${_width:+ width=\"$_width\"}"
__height="${_height:+ height=\"$_height\"}"