Rename → $_melt_video.

1 files changed, 17 insertions, 17 deletions

diff --git a/localvideowebencode b/localvideowebencode
index 21a98db..1766ca7 100755
--- a/localvideowebencode
+++ b/localvideowebencode
@@ -170,47 +170,47 @@ title=${title:-$stem}
 case "$profile" in
     320x240|qvga)
 	_melt_in="-profile=quarter_pal${_melt_in:+ $_melt_in}"
-	_melt="${size:-width=320 height=240}${_melt:+ $_melt}"
+	_melt_video="${size:-width=320 height=240}${_melt_video:+ $_melt_video}"
 	webmpreset="${webmpreset:-360p}"
 	;;
     480x360|hvga)
 	_melt_in="-profile=quarter_pal${_melt_in:+ $_melt_in}"
-	_melt="${size:-width=480 height=360}${_melt:+ $_melt}"
+	_melt_video="${size:-width=480 height=360}${_melt_video:+ $_melt_video}"
 	webmpreset="${webmpreset:-360p}"
 	;;
     640x480|vga)
 	_melt_in="-profile=quarter_pal${_melt_in:+ $_melt_in}"
-	_melt="${size:-width=640 height=480}${_melt:+ $_melt}"
+	_melt_video="${size:-width=640 height=480}${_melt_video:+ $_melt_video}"
 	webmpreset="${webmpreset:-360p}"
 	;;
     800x600|svga)
 	_melt_in="-profile=quarter_pal${_melt_in:+ $_melt_in}"
-	_melt="${size:-width=800 height=600}${_melt:+ $_melt}"
+	_melt_video="${size:-width=800 height=600}${_melt_video:+ $_melt_video}"
 	webmpreset="${webmpreset:-360p}"
 	;;
     1024x768|xga)
 	_melt_in="-profile=quarter_pal${_melt_in:+ $_melt_in}"
-	_melt="${size:-width=1024 height=768}${_melt:+ $_melt}"
+	_melt_video="${size:-width=1024 height=768}${_melt_video:+ $_melt_video}"
 	webmpreset="${webmpreset:-720p}"
 	;;
     240p|432x240|wqvga)
 	_melt_in="-profile=atsc_720p_25${_melt_in:+ $_melt_in}"
-	_melt="${size:-width=432 height=240}${_melt:+ $_melt}"
+	_melt_video="${size:-width=432 height=240}${_melt_video:+ $_melt_video}"
 	webmpreset="${webmpreset:-360p}"
 	;;
     360p|640x360|nhd)
 	_melt_in="-profile=atsc_720p_25${_melt_in:+ $_melt_in}"
-	_melt="${size:-width=640 height=360}${_melt:+ $_melt}"
+	_melt_video="${size:-width=640 height=360}${_melt_video:+ $_melt_video}"
 	webmpreset="${webmpreset:-360p}"
 	;;
     480p|848x480|wvga)
 	_melt_in="-profile=atsc_720p_25${_melt_in:+ $_melt_in}"
-	_melt="${size:-width=848 height=480}${_melt:+ $_melt}"
+	_melt_video="${size:-width=848 height=480}${_melt_video:+ $_melt_video}"
 	webmpreset="${webmpreset:-360p}"
 	;;
     576p|1024x576|wsvga)
 	_melt_in="-profile=atsc_720p_25${_melt_in:+ $_melt_in}"
-	_melt="${size:-width=1024 height=576}${_melt:+ $_melt}"
+	_melt_video="${size:-width=1024 height=576}${_melt_video:+ $_melt_video}"
 	webmpreset="${webmpreset:-360p}"
 	;;
     720p|1280x720|wxga|hd)
@@ -218,13 +218,13 @@ case "$profile" in
 	webmpreset="${webmpreset:-720p}"
 	;;
     '')
-	_melt="progressive=1 frame_rate_den=1${_melt:+ $_melt}"
-	[ "25" != "$rate" ] || _melt="{_melt:+$_melt }frame_rate_num=$rate"
+	_melt_video="progressive=1 frame_rate_den=1${_melt_video:+ $_melt_video}"
+	[ "25" != "$rate" ] || _melt_video="{_melt_video:+$_melt_video }frame_rate_num=$rate"
 	;;
     *) exit1 "Unknown profile \"$profile\" - please specify size and aspect directly.";;
 esac
 
-[ "25" = "$rate" ] || _melt="{_melt:+$_melt }frame_rate_num=$rate"
+[ "25" = "$rate" ] || _melt_video="{_melt_video:+$_melt_video }frame_rate_num=$rate"
 
 case "$h264profile" in
     baseline|main)
@@ -264,7 +264,7 @@ esac
 
 # TODO: When verified beneficial, add option real_time=-2
 _melt_in="${_melt_in:+$_melt_in }-progress $sample"
-_melt="$_melt ${bitrate:+vb=${bitrate}} ${size:+s=$size} ${aspect:+aspect=$aspect}"
+_melt_video="$_melt_video ${bitrate:+vb=${bitrate}} ${size:+s=$size} ${aspect:+aspect=$aspect}"
 _melt_ogg="f=ogg vcodec=libtheora ${bitrate:-qscale=5}"
 _melt_h264="$_melt_h264 ${bitrate:-qscale=5}"
 _melt_webm="${webmpreset:+-vpre=libvpx-$webmpreset}"
@@ -273,11 +273,11 @@ _melt_vorbis="$_melt_audio acodec=libvorbis ab=$(($channels*$bitrate_vorbis))k"
 _melt_aac="$_melt_audio acodec=aac ab=$(($channels*$bitrate_aac))k"
 
 ## Theora/Vorbis/Ogg
-melt -group $_melt_in $infiles -group $filters -consumer avformat:"$stem.ogv" $_melt_ogg $_melt $_melt_vorbis $_melt_out
+melt -group $_melt_in $infiles -group $filters -consumer avformat:"$stem.ogv" $_melt_ogg $_melt_video $_melt_vorbis $_melt_out
 
 ## H.264/AAC/MP4
-[ -z "$bitrate" ] || melt -group $_melt_in $infiles -group $filters -consumer avformat:/dev/null properties=x264-medium-pass1 $_melt_h264 $_melt $_melt_out
-melt -group $_melt_in $infiles -group $filters -consumer avformat:"$stem.mp4" ${bitrate:+pass=2} $_melt_h264 $_melt $_melt_aac $_melt_out
+[ -z "$bitrate" ] || melt -group $_melt_in $infiles -group $filters -consumer avformat:/dev/null properties=x264-medium-pass1 $_melt_h264 $_melt_video $_melt_out
+melt -group $_melt_in $infiles -group $filters -consumer avformat:"$stem.mp4" ${bitrate:+pass=2} $_melt_h264 $_melt_video $_melt_aac $_melt_out
 # TODO: drop qt-faststart when melt 0.9.2 is stable
 mv "$stem.mp4" "$stem.mp4"~
 qt-faststart "$stem.mp4"~ "$stem.mp4"
@@ -285,7 +285,7 @@ qt-faststart "$stem.mp4"~ "$stem.mp4"
 
 ## VP8/Vorbis/WebM
 # TODO: use two-pass when supported by melt
-melt -group $_melt_in $infiles -group $filters -consumer avformat:"$stem.webm" properties=webm $_melt_webm $_melt $_melt_vorbis $_melt_out
+melt -group $_melt_in $infiles -group $filters -consumer avformat:"$stem.webm" properties=webm $_melt_webm $_melt_video $_melt_vorbis $_melt_out
 
 ## JPEG preview
 ffmpegthumbnailer -s0 -i "$stem.mp4" -o "$stem.jpg"