diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 03:46:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 03:46:40 +0100 |
| commit | acb8d655d7507e4af8c5ba8e0e3a8ed74ce30c94 (patch) | |
| tree | 255e766736bcbee5846c016b1bc55e8159a6892a | |
| parent | 1abb03195930163ba2c5850599c1380bd8b09c58 (diff) | |
| parent | d5717bc4e9cc253a933ae8130eea3a9c8bc33c0b (diff) | |
| download | ffmpeg-acb8d655d7507e4af8c5ba8e0e3a8ed74ce30c94.tar.gz | |
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>
| -rw-r--r-- | Changelog | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |