From 2aa3b0f3db72602a9950c41f373c4ad45019470b Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 7 Feb 2021 18:51:47 +0100 Subject: use "avc" as preferred format name (h264 only as alternate name) --- localvideowebencode | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/localvideowebencode b/localvideowebencode index 1a32f94..4a97bf6 100755 --- a/localvideowebencode +++ b/localvideowebencode @@ -89,8 +89,8 @@ html favoring open formats with optional non-JavaScript Flash fallback. theora ogg Ogg Theora Vorbis vp8 webm WebM VP8 Vorbis vp9 WebM VP9 Opus - h264 mp4 MPEG-4 H.264/AVC AAC-LC - (default: webm,vp9,mp4) + avc h264 mp4 MPEG-4 H.264/AVC AAC-LC + (default: webm,vp9,avc) --audio Audio style: [channels] [bitrate per channel] music max. 2 ~48-64k @@ -120,13 +120,13 @@ html favoring open formats with optional non-JavaScript Flash fallback. hq high exact slow 2xCQ¹ exact medium exact slow 2xCQ¹ quality medium vary medium Q² - ¹ h264 uses 1-pass + ¹ avc uses 1-pass ² vp8 uses "soft-CQ" (CQ with very high bitrate) (default: normal) --quality Quality rate factor: auto [integer] none - suggested, h264: 19 23 27 31 35 39 + suggested, avc: 19 23 27 31 35 39 suggested, vp8/vp9: 27 33 39 45 51 57 - (default: auto - 23 for h264, 33 for vp8/vp9) + (default: auto - 23 for avc, 33 for vp8/vp9) --gpu Use hardware acceleration: none auto vaapi qsv (default: auto when compression=dirty, else none) --gpudevice Device used for hardware acceleration @@ -159,7 +159,7 @@ exit1() { } # defaults -formats=webm,vp9,mp4 +formats=webm,vp9,avc stillframe=0 samplestart=0 samplelength=150 @@ -456,7 +456,7 @@ esac for format in $(echo "$formats" | sed -e 's/,/ /g'); do case $format in theora|ogg) ogg=yes;; - h264|mp4) mp4=yes;; + avc|h264|mp4) mp4=yes;; vp8|webm) webm=yes;; vp9) vp9=yes;; *) exit1 "Unknown format \"$format\".";; -- cgit v1.2.3