summaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2019-06-12 14:46:50 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2019-06-24 09:32:13 +0200
commit2c41070f6691ed98a93b245b4ecb17fd898002ab (patch)
treebec929230e7dd88f7ab9f90bfcdd6b9b21b0b088 /README.md
parent7102f830e01c3d4d695c0d36608cb09064e4aedc (diff)
downloadODR-AudioEnc-2c41070f6691ed98a93b245b4ecb17fd898002ab.tar.gz
ODR-AudioEnc-2c41070f6691ed98a93b245b4ecb17fd898002ab.tar.bz2
ODR-AudioEnc-2c41070f6691ed98a93b245b4ecb17fd898002ab.zip
Add EDI output and rework odr-audioenc.cpp
Diffstat (limited to 'README.md')
-rw-r--r--README.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/README.md b/README.md
index 86804d0..eda92e4 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ in the [repository](https://github.com/Opendigitalradio/fdk-aac.git).
The main tool is the *odr-audioenc* encoder, which can read audio from
a file (raw or wav), from an ALSA source, from JACK or using libVLC,
-and encode to a file, a pipe, or to a ZeroMQ output compatible with ODR-DabMux.
+and encode to a file, a pipe, to a ZeroMQ or EDI output compatible with ODR-DabMux.
The libVLC input allows the encoder to use all inputs supported by VLC, and
therefore also webstreams and other network sources.
@@ -282,6 +282,7 @@ The ODR-AudioEnc project contains
http://www.apache.org/licenses/LICENSE-2.0
- libtoolame-dab, derived from TooLAME, licensed under LGPL v2.1 or later. See
libtoolame-dab/LGPL.txt. This is built into a shared library.
+ - EDI output (files in src/edi) are GPLv3+
The odr-audioenc binary is linked against the libtoolame-dab and fdk-aac
shared libraries.