aboutsummaryrefslogtreecommitdiffstats
path: root/Changelog
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-12 00:35:30 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-12 00:38:39 +0200
commitcbcc5cbbd82523dd1ec56e578bd9e32a56e6270e (patch)
treeddf192ef27fd72e08f99ea9469c67d422f5361ca /Changelog
parent9a2153894f2390a6da8d64d0c779ff0fd72d79c2 (diff)
parent67fad0d221458d43edb9037c30171d0adb1d609a (diff)
downloadffmpeg-cbcc5cbbd82523dd1ec56e578bd9e32a56e6270e.tar.gz
Merge remote-tracking branch 'jamrial/adpcm'
* jamrial/adpcm: ADPCM IMA Radical decoder RedSpark demuxer RSD demuxer adpcm_thp: Allow the use of extradata for the adpcm table ADP demuxer ADPCM DTK decoder Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Changelog')
-rw-r--r--Changelog5
1 files changed, 5 insertions, 0 deletions
diff --git a/Changelog b/Changelog
index c8d4b81d90..98c06227a2 100644
--- a/Changelog
+++ b/Changelog
@@ -40,6 +40,11 @@ version <next>:
- Matroska muxer can now put the index at the beginning of the file.
- extractplanes filter
- avectorscope filter
+- ADPCM DTK decoder
+- ADP demuxer
+- RSD demuxer
+- RedSpark demuxer
+- ADPCM IMA Radical decoder
version 1.2: