X-Git-Url: https://git.piment-noir.org/?p=deb_ffmpeg.git;a=blobdiff_plain;f=ffmpeg%2Flibavutil%2Fopencl.c;h=36cb6fe81d743bbc5fd3bbf23f9837c85c416c7e;hp=0b4f83b9105ea12f58233f183132563b39cc9fd6;hb=f6fa7814ccfe3e76514b36cf04f5cd3cb657c8cf;hpb=2ba45a602cbfa7b771effba9b11bb4245c21bc00 diff --git a/ffmpeg/libavutil/opencl.c b/ffmpeg/libavutil/opencl.c index 0b4f83b..36cb6fe 100644 --- a/ffmpeg/libavutil/opencl.c +++ b/ffmpeg/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;