From 12fbab171cc82d69843bab935be4976c3c8550bd Mon Sep 17 00:00:00 2001
From: root <root@atreju.jones.dk>
Date: Tue, 2 Sep 2014 15:00:03 +0200
Subject: Rename internal vars arg* → _melt*.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/localvideowebencode b/localvideowebencode
index 7e90b28..db9ade3 100755
--- a/localvideowebencode
+++ b/localvideowebencode
@@ -104,14 +104,14 @@ done
 
 while [ $# -gt 0 ] ; do
 	case "$1" in
-		*=*) args_in="${args_in:+$args_in }$1"; shift;;
+		*=*) _melt_in="${_melt_in:+$_melt_in }$1"; shift;;
 		*) break;;
 	esac
 done
 
 while [ $# -gt 0 ] ; do
 	case "$1" in
-		*=*) args_out="${args_out:+$args_out }$1"; shift;;
+		*=*) _melt_out="${_melt_out:+$_melt_out }$1"; shift;;
 		*) infiles="${infiles:+$infiles }$1"; shift;;
 	esac
 done
@@ -132,19 +132,19 @@ title=${title:-$stem}
 # TODO: Check and fail if all needed tools are not available
 
 # TODO: When verified beneficial, add option real_time=-2
-args_in="-progress $sample ${profile:+-profile $profile}${args_in:+ $args_in}"
-args=" ${bitrate:+vb=${bitrate}} ${size:+s=$size} ${aspect:+aspect=$aspect}"
-args_audio="ab=96k"
+_melt_in="-progress $sample ${profile:+-profile $profile}${_melt_in:+ $_melt_in}"
+_melt=" ${bitrate:+vb=${bitrate}} ${size:+s=$size} ${aspect:+aspect=$aspect}"
+_melt_audio="ab=96k"
 
 # x264 Baseline requies progressive output (and probably nice generally)
-args="${args+$args }progressive=1"
+_melt="${_melt+$_melt }progressive=1"
 
 ## Theora/Vorbis/Ogg
-melt -group $args_in $infiles -group $filters -consumer avformat:"$stem.ogg" f=ogg vcodec=libtheora $args acodec=libvorbis $args_audio $args_out
+melt -group $_melt_in $infiles -group $filters -consumer avformat:"$stem.ogg" f=ogg vcodec=libtheora $_melt acodec=libvorbis $_melt_audio $_melt_out
 
 ## H.264/AAC/MP4
-[ -z "$bitrate" ] || melt -group $args_in $infiles -group $filters -consumer avformat:/dev/null properties=x264-medium-pass1 properties=x264-medium-$h264profile $args $args_out
-melt -group $args_in $infiles -group $filters -consumer avformat:"$stem.mp4" ${bitrate:+pass=2} properties=x264-medium-$h264profile $args acodec=aac $args_audio $args_out
+[ -z "$bitrate" ] || melt -group $_melt_in $infiles -group $filters -consumer avformat:/dev/null properties=x264-medium-pass1 properties=x264-medium-$h264profile $_melt $_melt_out
+melt -group $_melt_in $infiles -group $filters -consumer avformat:"$stem.mp4" ${bitrate:+pass=2} properties=x264-medium-$h264profile $_melt acodec=aac $_melt_audio $_melt_out
 # TODO: drop qt-faststart when melt 0.9.2 is stable
 mv "$stem.mp4" "$stem.mp4"~
 qt-faststart "$stem.mp4"~ "$stem.mp4"
@@ -152,7 +152,7 @@ qt-faststart "$stem.mp4"~ "$stem.mp4"
 
 ## VP8/Vorbis/WebM
 # TODO: use two-pass when supported by melt
-melt -group $args_in $infiles -group $filters -consumer avformat:"$stem.webm" properties=webm $args $args_audio $args_out
+melt -group $_melt_in $infiles -group $filters -consumer avformat:"$stem.webm" properties=webm $_melt $_melt_audio $_melt_out
 
 ## JPEG preview
 ffmpegthumbnailer -s0 -i "$stem.mp4" -o "$stem.jpg"
-- 
cgit v1.2.3