Merge branch 'master' of git://git.emacsconf.org/emacsconf-wiki

1 files changed, 7 insertions, 2 deletions

diff --git a/2022/prepare.md b/2022/prepare.md
index 1ed04bcd..fe678b57 100644
--- a/2022/prepare.md
+++ b/2022/prepare.md
@@ -81,6 +81,10 @@ free software, depending on your needs:
 - [peek](//github.com/phw/peek)
 - [ffmpeg](//trac.ffmpeg.org/wiki/Capture/Desktop)
 
+If you decide to use OBS, please make sure to verify the window-capture
+options.  Most notably, there is a “Swap red and blue” option that is
+necessary for some setup, and it's easy to miss it.
+
 You might find the following free software programs useful for editing
 your video recordings:
 
@@ -108,8 +112,9 @@ WebM format if possible.*
 If you would like to compress your video before uploading, the following shell script may be useful:
 
     Q=32
-    ffmpeg -y -i "$1" -c:v libvpx-vp9 -b:v 0 -crf $Q -aq-mode 2 -an -tile-columns 0 -tile-rows 0 -frame-parallel 0 -cpu-used 8 -auto-alt-ref 1 -lag-in-frames 25 -g 240 -pass 1 -f webm -threads 8 /dev/null &&
-    ffmpeg -y -i "$1" -c:v libvpx-vp9 -b:v 0 -crf $Q -c:a copy -tile-columns 2 -tile-rows 2 -frame-parallel 0 -cpu-used -5 -auto-alt-ref 1 -lag-in-frames 25 -pass 2 -g 240 -threads 8 "$2"
+    CPU=8
+    ffmpeg -y -i "$1" -c:v libvpx-vp9 -b:v 0 -crf $Q -an -row-mt 1 -tile-columns 2 -tile-rows 2 -cpu-used $CPU -g 240 -pass 1 -f webm -threads $CPU /dev/null &&
+    ffmpeg -y -i "$1" -c:v libvpx-vp9 -b:v 0 -crf $Q -c:a libopus -row-mt 1 -tile-columns 2 -tile-rows 2 -cpu-used $CPU -pass 2 -g 240 -threads $CPU "$2"
 
 If you put it in a file called `compress-video.sh`, you can execute it
 from the command line with something like `sh compress-video.sh