diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 21:44:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 21:44:58 +0100 |
| commit | e821910a21510c2423c345b615602b42af26a70a (patch) | |
| tree | 3ab3c71873b2077a21007c26d94ce38400b1d372 /Changelog | |
| parent | dfe5a9f022b38ba292212ce2daff60221e411e10 (diff) | |
| parent | 062cd5a975ff7bd6fb91f9b4d1d9d102a7545499 (diff) | |
Merge commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499'
* commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499':
lavf: Add DSS demuxer
Conflicts:
libavformat/Makefile
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Changelog')
| -rw-r--r-- | Changelog | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -31,7 +31,7 @@ version <next>: - DXVA2-accelerated HEVC decoding - AAC ELD 480 decoding - Intel QSV-accelerated H.264 decoding -- DSS SP decoder +- DSS SP decoder and DSS demuxer version 2.5: - HEVC/H.265 RTP payload format (draft v6) packetizer |