diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 18:04:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 18:05:25 +0100 |
| commit | 6262763d8d6457dc9df09331ba24a4219cf56849 (patch) | |
| tree | d748170d35bb0fd2437241334f563b6e541c6d18 /Changelog | |
| parent | 0fbeeb939915b69050d00feab93aa904d133ec5f (diff) | |
| parent | b6a4701612514c97d22f7ffb37993539f7718352 (diff) | |
| download | ffmpeg-6262763d8d6457dc9df09331ba24a4219cf56849.tar.gz | |
Merge commit 'b6a4701612514c97d22f7ffb37993539f7718352'
* commit 'b6a4701612514c97d22f7ffb37993539f7718352':
mpegts: Support HEVC demuxing
Conflicts:
Changelog
libavformat/version.h
See: 93c1fe4de3937df63c3d68e87dd7d2fabd5203c0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Changelog')
| -rw-r--r-- | Changelog | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -49,8 +49,7 @@ 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, HEVC in Matroska demuxing -- HEVC demuxing in TS +- raw HEVC, HEVC in MOV/MP4, HEVC in Matroska, HEVC in MPEG-TS demuxing - mergeplanes filter |