diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-08 22:46:52 +0100 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-08 22:46:52 +0100 |
commit | 939345854a9e8ab32e88b9c9c99c8772049fb965 (patch) | |
tree | cfd14d6e1004644dcec785914835998063afa07a /Changelog | |
parent | a82d1a8c7a4b313a8d41334acbbb767c530c8e26 (diff) | |
parent | 83f230c2445a94fdd94c66504482217fcece5909 (diff) | |
download | ffmpeg-939345854a9e8ab32e88b9c9c99c8772049fb965.tar.gz |
Merge commit '83f230c2445a94fdd94c66504482217fcece5909'
* commit '83f230c2445a94fdd94c66504482217fcece5909':
lavc: VAAPI MJPEG encoder
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'Changelog')
-rw-r--r-- | Changelog | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -30,7 +30,7 @@ version <next>: - libnpp/CUDA-accelerated format conversion and scaling - Duck TrueMotion 2.0 Real Time decoder - Wideband Single-bit Data (WSD) demuxer -- VAAPI-accelerated H.264/HEVC encoding +- VAAPI-accelerated H.264/HEVC/MJPEG encoding version 3.0: - Common Encryption (CENC) MP4 encoding and decoding support |