diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 06:28:13 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 06:28:13 +0300 |
commit | 5a284d076ffdca705204e3e4100917cd4dbda14c (patch) | |
tree | 409db710f32304c4192b2cebf4446bb0242b8189 /Changelog | |
parent | fcca7671e29b67812d29af710ff90486944ee428 (diff) | |
parent | 22526c1f557a72b3285d295bd8b30c40eb65d437 (diff) |
Merge commit '22526c1f557a72b3285d295bd8b30c40eb65d437'
* commit '22526c1f557a72b3285d295bd8b30c40eb65d437':
Canopus HQ/HQA decoder
Conflicts:
Changelog
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Changelog')
-rw-r--r-- | Changelog | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -17,6 +17,7 @@ version <next>: - WebM Live Chunk Muxer - nvenc level and tier options - chorus filter +- Canopus HQ/HQA decoder version 2.6: |