summaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2014-02-09 17:04:08 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2014-02-09 17:12:41 +0100
commit916fd248d6fce66cdcb9213b51f81fee1f5494b2 (patch)
treed369f42901b9211ea4acb55f669adbc7334b53b0 /README
parent1f5df5b91e784e78c9fc017844f056a880e0a412 (diff)
downloaddabmux-916fd248d6fce66cdcb9213b51f81fee1f5494b2.tar.gz
dabmux-916fd248d6fce66cdcb9213b51f81fee1f5494b2.tar.bz2
dabmux-916fd248d6fce66cdcb9213b51f81fee1f5494b2.zip
update README and AUTHORS
Diffstat (limited to 'README')
-rw-r--r--README43
1 files changed, 13 insertions, 30 deletions
diff --git a/README b/README
index 8db597e..b1a65e0 100644
--- a/README
+++ b/README
@@ -1,35 +1,12 @@
-LICENSING
-=========
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Her Majesty
-the Queen in Right of Canada (Communications Research Center Canada)
-
-Copyright (C) 2013, 2014
-Matthias P. Braendli, http://mpb.li
-
-This file is part of ODR-DabMux.
-
-ODR-DabMux is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-ODR-DabMux is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>.
-
OVERVIEW
========
-This is ODR-DabMux 0.4.0
+ODR-DabMux is a fork of CRC-DabMux, which was developed by the Communications
+Research Center Canada. It has been forked by the Opendigitalradio project.
ODR-DabMux is a DAB (Digital Audio Broadcasting) multiplexer compliant to
ETSI EN 300 401.
-This version has been modified, and contains additional features compared
-to the official one:
+In addition to the features of CRC-DabMux, this fork contains:
- configuration file support, see doc/example.mux
- timestamping support required for SFN
- a ZeroMQ ETI output that can be used with ODR-DABMOD
@@ -41,19 +18,25 @@ to the official one:
The src/ directory contains the source code of ODR-DabMux.
-The doc/ directory contains the ODR-DabMux documentation.
+The doc/ directory contains the ODR-DabMux documentation, and an example
+configuration file.
-The lib/ directory contains source code of libraries need to build ODR-DabMux.
+The lib/ directory contains source code of libraries needed to build
+ODR-DabMux.
INSTALL
=======
See the INSTALL file for installation instructions.
+LICENCE
+=======
+See the files LICENCE and COPYING
+
CONTACT
=======
-Pascal Charest <pascal [dot] charest [at] crc [dot] ca>
Matthias P. Braendli <matthias [at] mpb [dot] li>
+Pascal Charest <pascal [dot] charest [at] crc [dot] ca>
http://opendigitalradio.org/
-http://mpb.li/
http://mmbtools.crc.ca/
+http://mpb.li/