Michael Niedermayer
|
74a8dbe1c4
|
Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'
* commit '58400ac133bcfb6bf8196b4e5208bc178307739b':
lavfi: name anonymous structs
Conflicts:
libavfilter/buffersink.c
libavfilter/f_select.c
libavfilter/src_movie.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_overlay.c
libavfilter/vf_showinfo.c
libavfilter/vf_unsharp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-04-19 18:20:17 +02:00 |
Lenny Wang
|
7c02a77d25
|
avfilter/unsharp: added optimized opencl kernels
Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2013-11-07 22:31:43 +01:00 |
Lenny Wang
|
89a3be8921
|
avfilter/opencl: compile kernels separately
Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2013-11-05 14:29:55 +01:00 |
Clément Bœsch
|
4db84bac13
|
lavfi/opencl: replace SHIFTUP with FF_CEIL_RSHIFT.
|
2013-05-09 16:59:43 +02:00 |
highgod0401
|
cd134963e8
|
lavfi/unsharp: add opencl unsharp filter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2013-04-26 03:05:26 +02:00 |