diff options
| author | James Almer <jamrial@gmail.com> | 2014-09-14 21:19:29 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2014-09-15 15:50:17 -0300 |
| commit | 95a064f5303478b70d2e1410f72505438ace2bb3 (patch) | |
| tree | 315167f6d26a759e31b5111a08ce1dda98266b44 /libavutil/opencl.c | |
| parent | af7d2606261ee06ada80c4dd8dd8d68bfcf008d2 (diff) | |
| download | ffmpeg-95a064f5303478b70d2e1410f72505438ace2bb3.tar.gz | |
avutil: remove obsolete FF_API_OLD_OPENCL cruft
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil/opencl.c')
| -rw-r--r-- | libavutil/opencl.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/libavutil/opencl.c b/libavutil/opencl.c index 0b4f83b910..36cb6fe81d 100644 --- a/libavutil/opencl.c +++ b/libavutil/opencl.c @@ -70,12 +70,6 @@ typedef struct { cl_context context; cl_device_id device_id; cl_command_queue command_queue; -#if FF_API_OLD_OPENCL - char *build_options; - int program_count; - cl_program programs[MAX_KERNEL_CODE_NUM]; - int kernel_count; -#endif int kernel_code_count; KernelCode kernel_code[MAX_KERNEL_CODE_NUM]; AVOpenCLDeviceList device_list; @@ -86,9 +80,6 @@ typedef struct { static const AVOption opencl_options[] = { { "platform_idx", "set platform index value", OFFSET(platform_idx), AV_OPT_TYPE_INT, {.i64=-1}, -1, INT_MAX}, { "device_idx", "set device index value", OFFSET(device_idx), AV_OPT_TYPE_INT, {.i64=-1}, -1, INT_MAX}, -#if FF_API_OLD_OPENCL - { "build_options", "build options of opencl", OFFSET(build_options), AV_OPT_TYPE_STRING, {.str="-I."}, CHAR_MIN, CHAR_MAX}, -#endif { NULL } }; @@ -475,19 +466,6 @@ cl_command_queue av_opencl_get_command_queue(void) return opencl_ctx.command_queue; } -#if FF_API_OLD_OPENCL -int av_opencl_create_kernel(AVOpenCLKernelEnv *env, const char *kernel_name) -{ - av_log(&opencl_ctx, AV_LOG_ERROR, "Could not create OpenCL kernel %s, please update libavfilter.\n", kernel_name); - return AVERROR(EINVAL); -} - -void av_opencl_release_kernel(AVOpenCLKernelEnv *env) -{ - av_log(&opencl_ctx, AV_LOG_ERROR, "Could not release OpenCL kernel, please update libavfilter.\n"); -} -#endif - static int init_opencl_env(OpenclContext *opencl_ctx, AVOpenCLExternalEnv *ext_opencl_env) { cl_int status; |