diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 17:57:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 17:57:57 +0100 |
| commit | 0fbeeb939915b69050d00feab93aa904d133ec5f (patch) | |
| tree | 410d9d0778c11108f4851655611c55753a4c711b /Changelog | |
| parent | 3a0c90263605f5cd7992e40d5b91a418621f623f (diff) | |
| parent | 959bea13ce3498a5bddf8a415a061a7bb5a8b075 (diff) | |
Merge commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075'
* commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075':
matroskadec: Support HEVC demuxing
Conflicts:
Changelog
libavformat/matroskadec.c
libavformat/version.h
See: 16b6839de6767924c4640d6e9204b6eeb5c53910
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Changelog')
| -rw-r--r-- | Changelog | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -49,8 +49,8 @@ version 2.1: - Enhanced Low Delay AAC (ER AAC ELD) decoding (no LD SBR support) - Linux framebuffer output device - HEVC decoder -- raw HEVC, HEVC in MOV/MP4 demuxing -- HEVC demuxing in TS, Matroska +- raw HEVC, HEVC in MOV/MP4, HEVC in Matroska demuxing +- HEVC demuxing in TS - mergeplanes filter |