summaryrefslogtreecommitdiff
path: root/Changelog
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-23 03:46:16 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-23 03:46:40 +0100
commitacb8d655d7507e4af8c5ba8e0e3a8ed74ce30c94 (patch)
tree255e766736bcbee5846c016b1bc55e8159a6892a /Changelog
parent1abb03195930163ba2c5850599c1380bd8b09c58 (diff)
parentd5717bc4e9cc253a933ae8130eea3a9c8bc33c0b (diff)
Merge commit 'd5717bc4e9cc253a933ae8130eea3a9c8bc33c0b'
* commit 'd5717bc4e9cc253a933ae8130eea3a9c8bc33c0b': changelog: switch libx265 and compand entries Conflicts: Changelog Not many changes as libx265 and compand are placed correctly for us Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Changelog')
-rw-r--r--Changelog2
1 files changed, 1 insertions, 1 deletions
diff --git a/Changelog b/Changelog
index ea55cc15bb..cd19277028 100644
--- a/Changelog
+++ b/Changelog
@@ -1,7 +1,7 @@
Entries are sorted chronologically from oldest to youngest within each release,
releases are sorted from youngest to oldest.
-version <next>
+version <next>:
- shuffleplanes filter
- subfile protocol
- Phantom Cine demuxer