On Sat, Mar 31, 2018 at 05:11:16AM +0000, Gabriel Machado wrote: > From: Gabriel Machado <gabriel_mach...@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
signature.asc
Description: PGP signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
