[FFmpeg-devel] [PATCH v4] avfilter: add OpenCL scale filter

[Michael Niedermayer]

On Sat, Mar 31, 2018 at 05:11:16AM +0000, Gabriel Machado wrote:
> From: Gabriel Machado <gabriel_machado at live.com>
> 
> Implemented the scaling filters using discrete convolution and ported most
> of the filters from libswscale.
> 
> ---
>  configure                     |   1 +
>  libavfilter/Makefile          |   1 +
>  libavfilter/allfilters.c      |   1 +
>  libavfilter/opencl/scale.cl   |  67 ++++++
>  libavfilter/opencl_source.h   |   1 +
>  libavfilter/vf_scale_opencl.c | 531 ++++++++++++++++++++++++++++++++++++++++++
>  6 files changed, 602 insertions(+)
>  create mode 100644 libavfilter/opencl/scale.cl
>  create mode 100644 libavfilter/vf_scale_opencl.c

doesnt apply anymore

applying: avfilter: add OpenCL scale filter
Using index info to reconstruct a base tree...
M	configure
M	libavfilter/allfilters.c
Falling back to patching base and 3-way merge...
Auto-merging libavfilter/allfilters.c
CONFLICT (content): Merge conflict in libavfilter/allfilters.c
Auto-merging configure
error: Failed to merge in the changes.
Patch failed at 0001 avfilter: add OpenCL scale filter


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

Asymptotically faster algorithms should always be preferred if you have
asymptotical amounts of data
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20180401/9edc0911/attachment.sig>