Merge commit 'f7c5fd81516fb7b186c64c66dc080e1139586226'

[ffmpeg] / Changelog

diff --git a/Changelog b/Changelog
index e62892d2924736c2b303515b0378cd2e6fcb0a96..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:
@@ -279,6 +280,7 @@ version 1.0:
 - 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