summaryrefslogtreecommitdiffstats
path: root/2020
diff options
context:
space:
mode:
authorAmin Bandali <bandali@gnu.org>2020-10-25 17:54:14 -0400
committerAmin Bandali <bandali@gnu.org>2020-10-25 17:54:14 -0400
commit3ffff46c010eb4b63e5a910e4f61615d68c64caa (patch)
tree4494b9c1d8d4f6dbc6e889da0e795d2f5789ed0f /2020
parent01b3ed54e3072dd3409cd3a541c095118fb0d8cc (diff)
downloademacsconf-wiki-3ffff46c010eb4b63e5a910e4f61615d68c64caa.tar.xz
emacsconf-wiki-3ffff46c010eb4b63e5a910e4f61615d68c64caa.zip
2020/prepare: join video codec paragraphs
Diffstat (limited to '2020')
-rw-r--r--2020/prepare.md10
1 files changed, 4 insertions, 6 deletions
diff --git a/2020/prepare.md b/2020/prepare.md
index 280b594a..7bddf3f0 100644
--- a/2020/prepare.md
+++ b/2020/prepare.md
@@ -68,12 +68,10 @@ receive prerecorded videos in formats unencumbered by software
patents, such as `video/webm` (WebM-encoded video files, with `.webm`
file extension) and `video/ogg` (video files encoded with the Theora
video codec, encapsulated in an Ogg transport layer, with `.ogg` or
-`.ogv` file extension).
-
-However, if for one reason or another you're unable to send us your
-prerecorded video in one of the above formats, you may submit them in
-other common formats, like MPEG-4 (`.mp4`), and we will try to convert
-them to our preferred formats on your behalf.
+`.ogv` file extension). However, if for one reason or another you are
+unable to send us your prerecorded video in one of the above formats,
+you may submit them in other common formats, like MPEG-4 (`.mp4`), and
+we will try to convert them to our preferred formats on your behalf.
### Office hours for video call tech-checks