Merge remote-tracking branch 'qatar/master'

[ffmpeg] / Changelog

diff --git a/Changelog b/Changelog
index 7b5d27778e264c80e83424dbd743284106c0d195..09e44d4935d7623ef4d3fb37bd21cb9e7888a3ab 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -13,8 +13,6 @@ version next:
 - tinterlace video filter
 - astreamsync audio filter
 - amerge audio filter
-- Indeo 4 decoder
-- SMJPEG demuxer
 - Automatic thread count based on detection number of (available) CPU cores
 - y41p Brooktree Uncompressed 4:1:1 12-bit encoder and decoder
 
@@ -153,6 +151,8 @@ easier to use. The changes are:
 - Dxtory capture format decoder
 - cellauto source
 - Simple segmenting muxer
+- Indeo 4 decoder
+- SMJPEG demuxer
 
 
 version 0.8: