diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2014-10-01 18:37:37 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2014-10-01 18:37:37 +0200 |
| commit | ac972d69ff720a4dec8384a1c17f1134d715b831 (patch) | |
| tree | ff29df9497818c4cb9bb58956b10c6a952ece494 /localvideowebencode | |
| parent | 55129b7d12f79b3e7a7cf77c4e4135cc2c2f4d33 (diff) | |
Tidy: Reorder to list options for free codecs before proprietary, and containers after codecs.
Diffstat (limited to 'localvideowebencode')
| -rwxr-xr-x | localvideowebencode | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/localvideowebencode b/localvideowebencode index b60deb5..2756435 100755 --- a/localvideowebencode +++ b/localvideowebencode @@ -369,17 +369,17 @@ melt="melt -progress" _melt_sample="$infile_first ${sample:+in=${samplestart:-0} out=$((${samplestart:-0} + samplelength))}" _melt_video="progressive=1${framerate:+ frame_rate_num="$framerate_num" frame_rate_den="$framerate_den"}${size:+ s=${width:+$width}x${height:+$height}}${aspect:+ aspect=$aspect}" _melt_ogg="$_melt_video f=ogg vcodec=libtheora${bitrate:+ vb=$bitrate} qscale=$qscale_theora" -_melt_h264="$_melt_video f=mp4 vcodec=libx264 vpreset=$speedpreset_h264 vprofile=baseline${x264tune:+ tune=$x264tune} threads=0 movflags=+faststart crf=$crf_h264" _melt_webm="$_melt_video f=webm vcodec=libvpx vpreset=libvpx-$webmpreset${bitrate_vp8:+ vb=$bitrate_vp8 minrate=$((bitrate_vp8/20)) maxrate=$((bitrate_vp8*12))} crf=$crf_vp8 cpu-used=$cpu_vp8" -_melt_img="$_melt_video f=image2" # CRF ignored with libvpx 1.3 _melt_vp9="$_melt_video f=webm vcodec=libvpx-vp9 vpreset=libvpx-$webmpreset${bitrate_vp9:+ vb=$bitrate_vp9 minrate=$((bitrate_vp9/20)) maxrate=$((bitrate_vp9*12))} crf=$crf_vp9 cpu-used=$cpu_vp9" +_melt_h264="$_melt_video f=mp4 vcodec=libx264 vpreset=$speedpreset_h264 vprofile=baseline${x264tune:+ tune=$x264tune} threads=0 movflags=+faststart crf=$crf_h264" _melt_audio="${channels:+ac=$channels}" # limit (i.e. avoid peaks "clipping") _melt_postfilters_audio="${limit:+-filter ladspa.1077}" _melt_vorbis="$_melt_audio acodec=libvorbis${channels:+ ab=$(($channels*$bitrate_vorbis))k}" _melt_opus="$_melt_audio acodec=libopus${channels:+ ab=$(($channels*$bitrate_opus))k}${opusapp:+ application=$opusapp}" _melt_aac="$_melt_audio acodec=aac${channels:+ ab=$(($channels*$bitrate_aac))k}" +_melt_img="$_melt_video f=image2" avconv="avconv -threads auto -y -v warning" _avconv_vp8="-c:v libvpx -pre:v libvpx-$webmpreset${bitrate_vp8:+ -b:v $bitrate_vp8 -minrate $((bitrate_vp8/20)) -maxrate $((bitrate_vp8*12))} -crf $crf_vp8 -cpu-used $cpu_vp8" @@ -409,9 +409,9 @@ $melt ${_melt_sample:-$infiles} \ ${channels:+$audioprefilters${_melt_loudness:+ -filter loudness results="$_melt_loudness"}} \ $filters${channels:+ $_melt_postfilters_audio} \ ${ogg:+-consumer avformat:$stem.ogv $_melt_ogg $_melt_vorbis} \ - ${mp4:+-consumer avformat:$stem.mp4 $_melt_h264 $_melt_aac} \ ${webm:+-consumer avformat:$stem.webm $_melt_webm${multipass:+ pass=2 passlogfile=${stem}_vp8} $_melt_vorbis} \ - ${vp9:+-consumer avformat:${stem}_vp9.webm${multipass:+ pass=2 passlogfile=${stem}_vp9} $_melt_vp9 $_melt_opus} + ${vp9:+-consumer avformat:${stem}_vp9.webm${multipass:+ pass=2 passlogfile=${stem}_vp9} $_melt_vp9 $_melt_opus} \ + ${mp4:+-consumer avformat:$stem.mp4 $_melt_h264 $_melt_aac} if [ -n "$mp4" ] && [ -z "$melt_recent" ]; then mv "$stem.mp4" "$stem.mp4"~ |