summaryrefslogtreecommitdiff
path: root/localvideowebencode
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2014-09-25 21:43:01 +0200
committerJonas Smedegaard <dr@jones.dk>2014-09-25 21:43:01 +0200
commit67d23140dbcda01e7f2b1ae8bdc14bfc7d07ef78 (patch)
treee95727fc02fc2d45ae97da734db184c3a62fd33b /localvideowebencode
parent8c9c9cd99e4b9ba9b23d7b2af06b610ddecaffdf (diff)
Tidy: Set bitrate only when fixed for H.264 (ignored in CRF mode).
Diffstat (limited to 'localvideowebencode')
-rwxr-xr-xlocalvideowebencode2
1 files changed, 1 insertions, 1 deletions
diff --git a/localvideowebencode b/localvideowebencode
index 2002df0..a47cf5e 100755
--- a/localvideowebencode
+++ b/localvideowebencode
@@ -346,7 +346,7 @@ melt="melt -progress"
_melt_in="${_melt_in:+$_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${bitrate:+ vb=$bitrate} threads=0 movflags=+faststart vpre=medium vprofile=baseline${x264tune:+ tune=$x264tune}${bitrate_fixed:- crf=23}"
+_melt_h264="$_melt_video f=mp4 vcodec=libx264${bitrate_fixed:+ vb=$bitrate} threads=0 movflags=+faststart vpre=medium vprofile=baseline${x264tune:+ tune=$x264tune}${bitrate_fixed:- crf=23}"
_melt_webm="$_melt_video f=webm vcodec=libvpx${bitrate:+ vb=$bitrate} vpre=libvpx-$webmpreset${bitrate_fixed:- crf=10} cpu-used=3"
# CRF ignored with libvpx 1.3
_melt_vp9="$_melt_video f=webm vcodec=libvpx-vp9${bitrate_vp9:+ vb=$bitrate_vp9} vpre=libvpx-$webmpreset${bitrate_fixed:- crf=10} cpu-used=5"