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>

diff --cc doc/general.texi
index 26919c9287c9c08085e4bd6917eb3c43f7227500,0c92761a49cf821dd248a373dcec1507ba9776af..3b73e31310d1a9c2d38861bbe3962946d29858a1
--- 1/doc/general.texi
--- 2/doc/general.texi
+++ b/doc/general.texi
@@@ -225,8 -237,17 +225,20 @@@ The dispatcher is open source and can b
  with the @code{--enable-libmfx} option and @code{pkg-config} needs to be able to
  locate the dispatcher's @code{.pc} files.
  
 -Libav can use the AMD Advanced Media Framework library for accelerated H.264 and HEVC encoding on VCE enabled hardware under Windows.
+ @section AMD VCE
+ 
 -To enable support you must obtain the AMF framework header files from @url{https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git}.
++FFmpeg can use the AMD Advanced Media Framework library for accelerated H.264
++and HEVC encoding on VCE enabled hardware under Windows.
+ 
 -Then Configure Libav with @code{--enable-amf}.
++To enable support you must obtain the AMF framework header files from
++@url{https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git}.
+ 
+ Create an @code{AMF/} directory in the system include path.
+ Copy the contents of @code{AMF/amf/public/include/} into that directory.
++Then configure FFmpeg with @code{--enable-amf}.
++
  
 -@chapter Supported File Formats and Codecs
 +@chapter Supported File Formats, Codecs or Features
  
  You can use the @code{-formats} and @code{-codecs} options to have an exhaustive list.
  

diff --cc libavcodec/amfenc.c
Simple merge

diff --cc libavcodec/amfenc_h264.c
Simple merge

diff --cc libavcodec/amfenc_hevc.c
Simple merge