summaryrefslogtreecommitdiff
path: root/Changelog
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-04-15 04:37:17 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-04-15 04:50:06 +0200
commit85b21147594101ba2d8e7ea2cfa504c0d1baee5a (patch)
tree62927788e459965cea1ff4cd23c219fcf0410b0e /Changelog
parent256c5b08bf09cb6403790d731cc1c771d8fb0e94 (diff)
parenta3a0af4fb1237bed0af75868073f9a63db8b1864 (diff)
Merge commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864'
* commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864': avutil: make aes and sha api public handle malloc failures in ff_get_wav_header add xWMA demuxer mpegts: force the default timebase libavcodec: Bump micro after adding the dtx AVOptions 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 d56780b9c2..a57c1e72e7 100644
--- a/Changelog
+++ b/Changelog
@@ -93,6 +93,7 @@ version <next>:
- fieldorder video filter added
- AAC encoding via libvo-aacenc
- AMR-WB encoding via libvo-amrwbenc
+- xWMA demuxer
version 0.6: