Prepare v2.6.1v2.6.1

3 files changed, 11 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 43d26c7..0767018 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2020-05-26: Matthias P. Braendli <matthias@mpb.li>
+	(v2.6.1):
+		Add --version option.
+		Do not build toolame-dab and fdk-aac dynamic libraries,
+		but link those statically into odr-audioenc.
+		Improve silence detection.
+		Minor changes in EDI output.
+
 2020-04-23: Matthias P. Braendli <matthias@mpb.li>
 	(v2.6.0):
 		Add GStreamer-based input.
diff --git a/README.md b/README.md
index c3ff900..ca50c2d 100644
--- a/README.md
+++ b/README.md
@@ -298,8 +298,8 @@ The ODR-AudioEnc project contains
  - The FDK-AAC encoder, patched for DAB+ support, licensed under the terms in
    `fdk-aac/NOTICE`, built into a shared library.
 
-The odr-audioenc binary is linked against the libtoolame-dab and fdk-aac
-shared libraries.
+The odr-audioenc binary is statically linked against the libtoolame-dab and fdk-aac
+libraries.
 
 Whether it is legal or not to distribute compiled binaries from these sources
 is unclear to me. Please seek legal advice to answer this question.
diff --git a/configure.ac b/configure.ac
index 5f94cfb..27932d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl                                               -*- Autoconf -*-
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([ODR-AudioEnc], [2.6.0], [http://opendigitalradio.org/])
+AC_INIT([ODR-AudioEnc], [2.6.1], [http://opendigitalradio.org/])
 AC_CONFIG_AUX_DIR(.)
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([tar-ustar foreign])