aboutsummaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorritjoe <ritjoe@users.noreply.github.com>2016-06-09 09:47:45 -0400
committerritjoe <ritjoe@users.noreply.github.com>2016-06-09 09:47:45 -0400
commitca70e8e01cb22ae0165ab4577c8cb9118e2f4893 (patch)
tree442d6dfa4f8dd385d94c8b582331c8a3b38a5fb8 /README.md
parentdce0f2ed3445b97f71921f4af3b2ffc73ffd5c9e (diff)
some spelling corrections
Diffstat (limited to 'README.md')
-rwxr-xr-xREADME.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/README.md b/README.md
index 0e2b527..a7c8c6b 100755
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
# Voctomix
-The [C3VOC](https://c3voc.de/) creates lecture recordings from German hacker/tech conferences. In the past we have used [dvswitch](http://dvswitch.alioth.debian.org/wiki/) very successfully but it has some serious limitations. Therefore we started looking for a replacement in 2014. We tested [snowmix](http://sourceforge.net/projects/snowmix/) and [gst-switch](https://github.com/timvideos/gst-switch) and while both did some things we wanted right, we realised that no existing tool would be able to fulfil all our whishes. Furthermore both are a nightmare to extend. So we decided to build our own Implementation of a Live-Video-Mixer.
+The [C3VOC](https://c3voc.de/) creates lecture recordings from German hacker/tech conferences. In the past we have used [dvswitch](http://dvswitch.alioth.debian.org/wiki/) very successfully but it has some serious limitations. Therefore we started looking for a replacement in 2014. We tested [snowmix](http://sourceforge.net/projects/snowmix/) and [gst-switch](https://github.com/timvideos/gst-switch) and while both did some things we wanted right, we realised that no existing tool would be able to fulfil all our wishes. Furthermore both are a nightmare to extend. So we decided to build our own implementation of a Live-Video-Mixer.
## Subprojects
The Voctomix project consists of three parts:
@@ -8,7 +8,7 @@ The Voctomix project consists of three parts:
- Voctomix [Example Scripts](./example-scripts/), a collection of tools and examples for talking to the core-process, feeding and receiving video-streams and controlling operations from scripts or command-line.
## Installation
-Voctomix requires a fairly recent Version of GStreamer (at least 1.5, though we recommend 1.6 and later). This is natively present on [Debian Sid](https://packages.debian.org/sid/libgstreamer1.0-0) and [Ubuntu Wily](http://packages.ubuntu.com/wily/libgstreamer1.0-0). On these systems it should run out of the box. We recommend using one of them. A [Docker](http://www.docker.com) image that uses Ubuntu Wily as a base is bundled with Vocomix. Please refer to the seperate [readme](./README_DOCKER.md) how to use the Docker image.
+Voctomix requires a fairly recent Version of GStreamer (at least 1.5, though we recommend 1.6 and later). This is natively present on [Debian Sid](https://packages.debian.org/sid/libgstreamer1.0-0) and [Ubuntu Wily](http://packages.ubuntu.com/wily/libgstreamer1.0-0). On these systems it should run out of the box. We recommend using one of them. A [Docker](http://www.docker.com) image that uses Ubuntu Wily as a base is bundled with Voctomix. Please refer to the seperate [readme](./README_DOCKER.md) how to use the Docker image.
Install the required dependencies:
````
@@ -48,7 +48,7 @@ curl https://c3voc.de/voctomix/gpg-key.asc | apt-key add -
apt-get update
````
-Now proceed as described on unter [Installation](#installation).
+Now proceed as described under [Installation](#installation).
## Quickstart using Docker