Merge commit 'be394968c81019887ef996a78a526bdd85d1e216'

[ffmpeg] / Changelog

diff --git a/Changelog b/Changelog
index 6a803251aeb09449e0665050f16c38ad07c256cf..27716848c89a69371d18922a80c3ca0ae4885d68 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -16,6 +16,7 @@ version <next>:
 - support decoding 16-bit RLE SGI images
 - GDI screen grabbing for Windows
 - alternative rendition support for HTTP Live Streaming
+- AVFoundation input device
 
 
 version 2.2:
@@ -278,6 +279,8 @@ version 1.0:
 - RTMPTE protocol support
 - showwaves and showspectrum filter
 - LucasArts SMUSH SANM playback support
+- LucasArts SMUSH VIMA audio decoder (ADPCM)
+- LucasArts SMUSH demuxer
 - SAMI, RealText and SubViewer demuxers and decoders
 - Heart Of Darkness PAF playback support
 - iec61883 device