aboutsummaryrefslogtreecommitdiffstats
path: root/Changelog
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-26 12:28:31 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-26 12:28:31 +0100
commitac021fdc40631f77a727f076f8748f89109c785b (patch)
treea51ba691da5f29c81d3ea61848b2938236f88ec2 /Changelog
parent0290a646ac662a8552dfdb2de4887cac7a79acd1 (diff)
parent56d061ce9da954560892e3551513d5ecc0439846 (diff)
downloadffmpeg-ac021fdc40631f77a727f076f8748f89109c785b.tar.gz
Merge commit '56d061ce9da954560892e3551513d5ecc0439846'
* commit '56d061ce9da954560892e3551513d5ecc0439846': metasound: add last missing modes (8kHz @ 6kbps per channel) Conflicts: Changelog doc/general.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Changelog')
-rw-r--r--Changelog1
1 files changed, 1 insertions, 0 deletions
diff --git a/Changelog b/Changelog
index fef0d14899..8d988d3b32 100644
--- a/Changelog
+++ b/Changelog
@@ -9,6 +9,7 @@ version <next>
- elbg filter
- string validation in ffprobe
- support for decoding through VDPAU in ffmpeg (the -hwaccel option)
+- complete Voxware MetaSound decoder
version 2.1: