[FFmpeg-devel] libavutil/opencl: output program build log

[Wei Gao]

2014-12-25 4:34 GMT+08:00 Michael Niedermayer <michaelni at gmx.at>:

> On Wed, Dec 24, 2014 at 07:55:13PM +0000, Titov, Alexey wrote:
> > Attached corrected patch
>
> should be ok
> if wei gao is ok with it then i can apply it
>
Hi, I tried to merge the three patches on mingw, but seems some errors, the
log is as follow.

Administrator at MCW-HIGHGOD
/E/ffmpeg/ffmpeg_submit/ffmpeg_updata/ffmpeg_unsharp
master)
$ git am 0001-libavfilter-unsharpen-opencl-filter-optimizations.patch
Applying: libavfilter: unsharpen opencl filter optimizations

Administrator at MCW-HIGHGOD
/E/ffmpeg/ffmpeg_submit/ffmpeg_updata/ffmpeg_unsharp
master)
$ git am 0002-Fixed-the-patch-according-to-the-suggestions.patch
Applying: Fixed the patch according to the suggestions
e:/ffmpeg/ffmpeg_submit/ffmpeg_updata/ffmpeg_unsharp/.git/rebase-apply/patch:10
: trailing whitespace.

warning: 1 line adds whitespace errors.

Administrator at MCW-HIGHGOD
/E/ffmpeg/ffmpeg_submit/ffmpeg_updata/ffmpeg_unsharp
master)
$ git am 0001-libavutil-opencl-output-program-build-failure-log.patch
Applying: libavutil/opencl: output program build failure log
e:/ffmpeg/ffmpeg_submit/ffmpeg_updata/ffmpeg_unsharp/.git/rebase-apply/patch:44
 trailing whitespace.

error: patch failed: libavutil/opencl.c:449
error: libavutil/opencl.c: patch does not apply
error: patch failed: libavutil/opencl.h:51
error: libavutil/opencl.h: patch does not apply
Patch failed at 0001 libavutil/opencl: output program build failure log
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

Thanks
Best regards


>
> [...]
>
> --
> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> I have never wished to cater to the crowd; for what I know they do not
> approve, and what they approve I do not know. -- Epicurus
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
>