Really fix parse rate expressed as fraction, and list numerator before denominator.

1 files changed, 4 insertions, 4 deletions

diff --git a/localvideowebencode b/localvideowebencode
index 4edba6e..d749f5b 100755
--- a/localvideowebencode
+++ b/localvideowebencode
@@ -247,16 +247,16 @@ EOF
 fi
 case "$framerate" in
     */*)
-	while read d n foo; do
-		framerate_den="${framerate_den:-$d}"
+	while read n d foo; do
 		framerate_num="${framerate_num:-$n}"
+		framerate_den="${framerate_den:-$d}"
 	done << EOF
 $(echo "$framerate" | perl -F/ -anE 'say join " ", @F')
 EOF
 	;;
     ?*)
-	framerate_den=1
 	framerate_num="$framerate"
+	framerate_den=1
 	;;
 esac
 
@@ -359,7 +359,7 @@ esac
 
 melt="melt -progress"
 _melt_sample="$infile_first ${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_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:+ vb=$bitrate} crf=$crf_vp8 cpu-used=$cpu_vp8"