aboutsummaryrefslogtreecommitdiffstats
path: root/Changelog
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-16 19:15:58 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-16 19:15:58 +0100
commitb74792a02721b7d12de7f6fa997922c2a237e147 (patch)
tree58d199d6c50f9b6451fa4b1a98a924bb983384fe /Changelog
parent40f88796c69ae453e5fc4b8cd6432fa0ca85b923 (diff)
downloadffmpeg-b74792a02721b7d12de7f6fa997922c2a237e147.tar.gz
Changelog: move post 2.2 branching entries out of the 2.2 changelog
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Changelog')
-rw-r--r--Changelog4
1 files changed, 2 insertions, 2 deletions
diff --git a/Changelog b/Changelog
index 19bd4763a3..ea55cc15bb 100644
--- a/Changelog
+++ b/Changelog
@@ -3,6 +3,8 @@ releases are sorted from youngest to oldest.
version <next>
- shuffleplanes filter
+- subfile protocol
+- Phantom Cine demuxer
version 2.2:
@@ -32,8 +34,6 @@ version 2.2:
- Support DNx444
- libx265 encoder
- dejudder filter
-- subfile protocol
-- Phantom Cine demuxer
version 2.1: