summaryrefslogtreecommitdiff
path: root/Changelog
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-03-28 01:50:36 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-03-28 01:50:36 +0200
commit25d8099beb4c7eb93539f9162af1336ef7130fed (patch)
tree4f668222da738409baf5ad8a1ee9d1c9f9004f96 /Changelog
parent57e2ded4234356c26bf92b0a627ec383ea8d288f (diff)
parent991f3de1bb696a55f7604e4b7d53492299fe44b5 (diff)
Merge remote-tracking branch 'newdev/master'
* newdev/master: ac3enc: Add codec-specific options for writing AC-3 metadata. NOT MERGED: Remove arrozcru URL from documentation sndio support for playback and record Conflicts: doc/faq.texi 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 c4e2194979..c91faabfe6 100644
--- a/Changelog
+++ b/Changelog
@@ -80,6 +80,7 @@ version <next>:
- Bitmap Brothers JV playback system
- Linux framebuffer input device added
- Apple HTTP Live Streaming protocol handler
+- sndio support for playback and record
version 0.6: