summaryrefslogtreecommitdiff
path: root/localvideowebencode
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2011-09-19 18:11:52 +0200
committerJonas Smedegaard <dr@jones.dk>2011-09-19 18:11:52 +0200
commit1ff2a693145af04b7a0706eeeebae332e36373e2 (patch)
tree55b351ca7ae1de06b3305cd218a8da753ba6319c /localvideowebencode
parenta00a4c3ad45064dd3443310b5c5a920338acb67d (diff)
Support ffmpeg abbreviations for --size.
Diffstat (limited to 'localvideowebencode')
-rwxr-xr-xlocalvideowebencode6
1 files changed, 4 insertions, 2 deletions
diff --git a/localvideowebencode b/localvideowebencode
index 2973012..9e8bfe9 100755
--- a/localvideowebencode
+++ b/localvideowebencode
@@ -26,7 +26,9 @@ Usage: $PRG --size SIZE [--profile PROFILE] [--title TITLE] INPUTFILE
Encode video file in multiple web-optimized formats, and provide sample
html favoring open formats with optional non-JavaScript Flash fallback.
- -s, --size Output size in WIDTHxHEIGHT
+ -s, --size Output size in WIDTHxHEIGHT or ffmpeg
+ abbreviation like vga qvga qcif hd480 etc.
+ (default: use input size)
-p, --profile Quality profile (lo, hi, lowide, hiwide)
(default: lo)
-t, --title Title used in html fallback graphics
@@ -151,7 +153,7 @@ _ffmpeg 2 mp4 $opts_common -vcodec libx264 -vpre medium -vpre baseline -acodec l
ffmpegthumbnailer -s0 -i "$filebase.ogg" -o "$filebase.jpg"
# resolve width and height from preview image
-size=${size:-$(jpeginfo "$filebase.jpg" | perl -ane 'print "$F[1]x$F[3]"')}
+size=$(jpeginfo "$filebase.jpg" | perl -ane 'print "$F[1]x$F[3]"')
width=$(echo "$size" | perl -Fx -ane 'print $F[0]')
height=$(echo "$size" | perl -Fx -ane 'print $F[1]')
heightplus=${height:+$(($height+4))}