From fe3c6634cc01b039863cf1412df6c21d720021f1 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Fri, 26 Sep 2014 20:32:13 +0200 Subject: Consistently accept either video codec or (main use of) container as format. --- localvideowebencode | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'localvideowebencode') diff --git a/localvideowebencode b/localvideowebencode index 6e5be78..126e1b2 100755 --- a/localvideowebencode +++ b/localvideowebencode @@ -61,11 +61,11 @@ html favoring open formats with optional non-JavaScript Flash fallback. -b, --bitrate Fixed video bitrate in bytes: e.g. 768k 1M (default: none - use variable bitrate) --formats Containers and codecs to use (comma-sparated): - container video codec audio codec - ogg Ogg Theora Vorbis - webm WebM VP8 Vorbis - vp9 WebM VP9 Opus - mp4 MPEG-4 H.264 AAC + container video codec audio codec + theora ogg Ogg Theora Vorbis + vp8 webm WebM VP8 Vorbis + vp9 WebM VP9 Opus + h264 mp4 MPEG-4 H.264 AAC (default: webm,vp9,mp4) --audio Audio style: channels limit Vorbis Opus AAC @@ -254,9 +254,9 @@ esac for format in $(echo "$formats" | sed -e 's/,/ /g'); do case $format in - ogg) ogg=yes;; - mp4) mp4=yes;; - webm) webm=yes;; + theora|ogg) ogg=yes;; + h264|mp4) mp4=yes;; + vp8|webm) webm=yes;; vp9) vp9=yes;; *) exit1 "Unknown format \"$format\".";; esac -- cgit v1.2.3