git.sesse.net Git - ffmpeg/commit

]> git.sesse.net Git - ffmpeg/commit

projects / ffmpeg / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 68de778 34c1133)

author	Mark Thompson <sw@jkqxz.net>
	Tue, 16 Jan 2018 23:25:27 +0000 (23:25 +0000)
committer	Mark Thompson <sw@jkqxz.net>
	Tue, 16 Jan 2018 23:25:27 +0000 (23:25 +0000)
commit	3895fce26ec7f6d2b1642f96ecaddede6521228e
tree	3987bb94bae98ce8b08d31237568d85d27f0993b	tree \| snapshot
parent	68de778ccc35bea885a989e47358089da006a8b6	commit \| diff
parent	34c113335b53d83ed343de49741f0823aa1f8cc6	commit \| diff

Merge commit '34c113335b53d83ed343de49741f0823aa1f8cc6'

* commit '34c113335b53d83ed343de49741f0823aa1f8cc6':
Add support for H.264 and HEVC hardware encoding for AMD GPUs based on AMF SDK

Most of this was already present from 9ea6607d294526688ab1b1342cb36ee159683e88,
this just applies some minor fixups and adds the general documentation.

Merged-by: Mark Thompson <sw@jkqxz.net>

doc/general.texi	diff1 \|	diff2 \|	blob \| history
libavcodec/amfenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/amfenc_h264.c	diff1 \|	diff2 \|	blob \| history
libavcodec/amfenc_hevc.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.