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>
This commit is contained in:
Michael Niedermayer 2014-03-23 03:46:16 +01:00
commit acb8d655d7

View File

@ -1,7 +1,7 @@
Entries are sorted chronologically from oldest to youngest within each release, Entries are sorted chronologically from oldest to youngest within each release,
releases are sorted from youngest to oldest. releases are sorted from youngest to oldest.
version <next> version <next>:
- shuffleplanes filter - shuffleplanes filter
- subfile protocol - subfile protocol
- Phantom Cine demuxer - Phantom Cine demuxer