[FFmpeg-devel] Added HW H.264 and HEVC encoding for AMD GPUs based on AMF SDK

[Michael Niedermayer]

On Mon, Nov 13, 2017 at 06:09:39PM -0500, mmironov wrote:
> From d6f467ec7f610f21f929f9c21f03af3cabe84cf2 Mon Sep 17 00:00:00 2001
> From: mmironov <mikhail.mironov at amd.com>
> Date: Tue, 7 Nov 2017 10:57:21 -0500
> Subject: [PATCH] Added HW accelerated H.264 and HEVC encoding for AMD
> 
> Signed-off-by: mmironov <mikhail.mironov at amd.com>
> ---
>  Changelog                |    1 +
>  compat/amd/amfsdkenc.h   | 1755 ++++++++++++++++++++++++++++++++++++++++++++++
>  configure                |   25 +
>  libavcodec/Makefile      |    4 +
>  libavcodec/allcodecs.c   |    2 +
>  libavcodec/amfenc.c      |  590 ++++++++++++++++
>  libavcodec/amfenc.h      |  143 ++++
>  libavcodec/amfenc_h264.c |  397 +++++++++++
>  libavcodec/amfenc_hevc.c |  328 +++++++++
>  9 files changed, 3245 insertions(+)
>  create mode 100644 compat/amd/amfsdkenc.h
>  create mode 100644 libavcodec/amfenc.c
>  create mode 100644 libavcodec/amfenc.h
>  create mode 100644 libavcodec/amfenc_h264.c
>  create mode 100644 libavcodec/amfenc_hevc.c

doesnt apply cleanly:
Applying: Added HW H.264 and HEVC encoding for AMD GPUs based on AMF SDK
.git/rebase-apply/patch:36: trailing whitespace.
//
.git/rebase-apply/patch:37: trailing whitespace.
// MIT license
.git/rebase-apply/patch:38: trailing whitespace.
//
.git/rebase-apply/patch:62: trailing whitespace.
// Full version of AMF SDK and the latest version of this file
.git/rebase-apply/patch:163: trailing whitespace.
#define AMF_WEAK __declspec( selectany )
warning: squelched 46 whitespace errors
warning: 51 lines add whitespace errors.
Using index info to reconstruct a base tree...
M       Changelog
M       configure
M       libavcodec/Makefile
M       libavcodec/allcodecs.c
.git/rebase-apply/patch:36: trailing whitespace.
//
.git/rebase-apply/patch:37: trailing whitespace.
// MIT license
.git/rebase-apply/patch:38: trailing whitespace.
//
.git/rebase-apply/patch:62: trailing whitespace.
// Full version of AMF SDK and the latest version of this file
.git/rebase-apply/patch:163: trailing whitespace.
#define AMF_WEAK __declspec( selectany )
warning: squelched 46 whitespace errors
warning: 51 lines applied after fixing whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging libavcodec/allcodecs.c
Auto-merging libavcodec/Makefile
CONFLICT (content): Merge conflict in libavcodec/Makefile
Auto-merging configure
CONFLICT (content): Merge conflict in configure
Auto-merging Changelog
CONFLICT (content): Merge conflict in Changelog
error: Failed to merge in the changes.
Patch failed at 0001 Added HW H.264 and HEVC encoding for AMD GPUs based on AMF SDK
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

If you drop bombs on a foreign country and kill a hundred thousand
innocent people, expect your government to call the consequence
"unprovoked inhuman terrorist attacks" and use it to justify dropping
more bombs and killing more people. The technology changed, the idea is old.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20171114/0346c8d8/attachment.sig>