From e5f047b5a975816f47d136aea3dee50bef7ec65c Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Tue, 7 Oct 2014 12:36:13 +0200
Subject: Fix audio style silence, and generally cleanup $(( )) variable
 expansion while at it.

---
 localvideowebencode | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/localvideowebencode b/localvideowebencode
index ae35e3f..53316c7 100755
--- a/localvideowebencode
+++ b/localvideowebencode
@@ -329,7 +329,7 @@ _width="${width:-$width_in}"
 _height="${height:-$height_in}"
 
 if [ -n "$_width" ] && [ -n "$_height" ]; then
-	_pixels="$(($_width*$_height))"
+	_pixels="$((_width*_height))"
 fi
 _frames="${framerate:-$framerate_in}"
 
@@ -462,10 +462,10 @@ _melt_pcm="$_melt_downmix acodec=pcm_s16le"
 _melt_vorbis="$_melt_downmix acodec=libvorbis aq=$quality_vorbis"
 _avconv_vorbis="$_avconv_downmix -c:a libvorbis -aq $quality_vorbis"
 _oggenc_vorbis="$_oggenc_downmix -q $quality_vorbis"
-_melt_opus="$_melt_downmix acodec=libopus ab=$(($channels*$bitrate_opus))k${opusapp:+ application=$opusapp}"
-_avconv_opus="$_avconv_downmix -c:a libopus -b:a $(($channels*$bitrate_opus))k${opusapp:+ -application $opusapp}"
+_melt_opus="$_melt_downmix acodec=libopus ab=$((channels*bitrate_opus))k${opusapp:+ application=$opusapp}"
+_avconv_opus="$_avconv_downmix -c:a libopus -b:a $((channels*bitrate_opus))k${opusapp:+ -application $opusapp}"
 _opusenc_opus="$_opusenc_downmix --bitrate $((channels*bitrate_opus))"
-_melt_aac="$_melt_downmix acodec=aac ab=$(($channels*$bitrate_aac))k"
+_melt_aac="$_melt_downmix acodec=aac ab=$((channels*bitrate_aac))k"
 
 # container options
 _melt_yuv4mpeg2="f=yuv4mpegpipe $_melt_video pix_fmt=yuv420p an=1 audio_off=1"
@@ -642,7 +642,7 @@ $melt $infile_first in=0 out=0 \
 __width="${_width:+ width=\"$_width\"}"
 __height="${_height:+ height=\"$_height\"}"
 # Flash object needs extra space for controllers
-__heightplus=${_height:+ height=\"$(($_height+4))\"}
+__heightplus=${_height:+ height=\"$((_height+4))\"}
 _source_ogg="<source src=\"$stem.ogv\" type=\"video/ogg\" />"
 _source_webm="<source src=\"$stem.webm\" type=\"video/webm\" />"
 _source_vp9="<source src=\"${stem}_vp9.webm\" type='video/ogg; codecs=\"vp9, opus\"' />"
-- 
cgit v1.2.3