lavu,lavfi,ffmpeg: Remove experimental OpenCL API

This was added in early 2013 and abandoned several months later; as far as
I can tell, there are no external users.  Future OpenCL use will be via
hwcontext, which requires neither special OpenCL-only API nor global state
in libavutil.

All internal users are also deleted - this is just the unsharp filter
(replaced by unsharp_opencl, which is more flexible) and the deshake filter
(no replacement).

5 files changed, 0 insertions, 1270 deletions

diff --git a/libavutil/Makefile b/libavutil/Makefile
index cc70c4e29f..721784086c 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -79,8 +79,6 @@ HEADERS = adler32.h                                                     \
 
 HEADERS-$(CONFIG_LZO)                   += lzo.h
 
-HEADERS-$(CONFIG_OPENCL)                += opencl.h
-
 ARCH_HEADERS = bswap.h                                                  \
                intmath.h                                                \
                intreadwrite.h                                           \
@@ -164,7 +162,6 @@ OBJS-$(CONFIG_DXVA2)                    += hwcontext_dxva2.o
 OBJS-$(CONFIG_QSV)                   += hwcontext_qsv.o
 OBJS-$(CONFIG_LIBDRM)                   += hwcontext_drm.o
 OBJS-$(CONFIG_LZO)                      += lzo.o
-OBJS-$(CONFIG_OPENCL)                   += opencl.o opencl_internal.o
 OBJS-$(CONFIG_OPENCL)                   += hwcontext_opencl.o
 OBJS-$(CONFIG_VAAPI)                    += hwcontext_vaapi.o
 OBJS-$(CONFIG_VIDEOTOOLBOX)             += hwcontext_videotoolbox.o
@@ -187,7 +184,6 @@ SKIPHEADERS-$(CONFIG_VDPAU)            += hwcontext_vdpau.h
 SKIPHEADERS-$(HAVE_ATOMICS_GCC)        += atomic_gcc.h
 SKIPHEADERS-$(HAVE_ATOMICS_SUNCC)      += atomic_suncc.h
 SKIPHEADERS-$(HAVE_ATOMICS_WIN32)      += atomic_win32.h
-SKIPHEADERS-$(CONFIG_OPENCL)           += opencl.h
 
 TESTPROGS = adler32                                                     \
             aes                                                         \
diff --git a/libavutil/opencl.c b/libavutil/opencl.c
deleted file mode 100644
index 202756516b..0000000000
--- a/libavutil/opencl.c
+++ /dev/null
@@ -1,875 +0,0 @@
-/*
- * Copyright (C) 2012 Peng  Gao     <peng@multicorewareinc.com>
- * Copyright (C) 2012 Li    Cao     <li@multicorewareinc.com>
- * Copyright (C) 2012 Wei   Gao     <weigao@multicorewareinc.com>
- * Copyright (C) 2013 Lenny Wang    <lwanghpc@gmail.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "opencl.h"
-#include "avstring.h"
-#include "log.h"
-#include "avassert.h"
-#include "opt.h"
-
-#if HAVE_THREADS
-#include "thread.h"
-#include "atomic.h"
-
-static pthread_mutex_t * volatile atomic_opencl_lock = NULL;
-#define LOCK_OPENCL pthread_mutex_lock(atomic_opencl_lock)
-#define UNLOCK_OPENCL pthread_mutex_unlock(atomic_opencl_lock)
-#else
-#define LOCK_OPENCL
-#define UNLOCK_OPENCL
-#endif
-
-#define MAX_KERNEL_CODE_NUM 200
-
-typedef struct {
-    int is_compiled;
-    const char *kernel_string;
-} KernelCode;
-
-typedef struct {
-    const AVClass *class;
-    int log_offset;
-    void *log_ctx;
-    int init_count;
-    int opt_init_flag;
-     /**
-     * if set to 1, the OpenCL environment was created by the user and
-     * passed as AVOpenCLExternalEnv when initing ,0:created by opencl wrapper.
-     */
-    int is_user_created;
-    int platform_idx;
-    int device_idx;
-    cl_platform_id platform_id;
-    cl_device_type device_type;
-    cl_context context;
-    cl_device_id device_id;
-    cl_command_queue command_queue;
-    int kernel_code_count;
-    KernelCode kernel_code[MAX_KERNEL_CODE_NUM];
-    AVOpenCLDeviceList device_list;
-} OpenclContext;
-
-#define OFFSET(x) offsetof(OpenclContext, x)
-
-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},
-     { NULL }
-};
-
-static const AVClass openclutils_class = {
-    .class_name                = "opencl",
-    .option                    = opencl_options,
-    .item_name                 = av_default_item_name,
-    .version                   = LIBAVUTIL_VERSION_INT,
-    .log_level_offset_offset   = offsetof(OpenclContext, log_offset),
-    .parent_log_context_offset = offsetof(OpenclContext, log_ctx),
-};
-
-static OpenclContext opencl_ctx = {&openclutils_class};
-
-static const cl_device_type device_type[] = {CL_DEVICE_TYPE_GPU, CL_DEVICE_TYPE_CPU};
-
-typedef struct {
-    int err_code;
-    const char *err_str;
-} OpenclErrorMsg;
-
-static const OpenclErrorMsg opencl_err_msg[] = {
-    {CL_DEVICE_NOT_FOUND,                               "DEVICE NOT FOUND"},
-    {CL_DEVICE_NOT_AVAILABLE,                           "DEVICE NOT AVAILABLE"},
-    {CL_COMPILER_NOT_AVAILABLE,                         "COMPILER NOT AVAILABLE"},
-    {CL_MEM_OBJECT_ALLOCATION_FAILURE,                  "MEM OBJECT ALLOCATION FAILURE"},
-    {CL_OUT_OF_RESOURCES,                               "OUT OF RESOURCES"},
-    {CL_OUT_OF_HOST_MEMORY,                             "OUT OF HOST MEMORY"},
-    {CL_PROFILING_INFO_NOT_AVAILABLE,                   "PROFILING INFO NOT AVAILABLE"},
-    {CL_MEM_COPY_OVERLAP,                               "MEM COPY OVERLAP"},
-    {CL_IMAGE_FORMAT_MISMATCH,                          "IMAGE FORMAT MISMATCH"},
-    {CL_IMAGE_FORMAT_NOT_SUPPORTED,                     "IMAGE FORMAT NOT_SUPPORTED"},
-    {CL_BUILD_PROGRAM_FAILURE,                          "BUILD PROGRAM FAILURE"},
-    {CL_MAP_FAILURE,                                    "MAP FAILURE"},
-    {CL_MISALIGNED_SUB_BUFFER_OFFSET,                   "MISALIGNED SUB BUFFER OFFSET"},
-    {CL_EXEC_STATUS_ERROR_FOR_EVENTS_IN_WAIT_LIST,      "EXEC STATUS ERROR FOR EVENTS IN WAIT LIST"},
-    {CL_COMPILE_PROGRAM_FAILURE,                        "COMPILE PROGRAM FAILURE"},
-    {CL_LINKER_NOT_AVAILABLE,                           "LINKER NOT AVAILABLE"},
-    {CL_LINK_PROGRAM_FAILURE,                           "LINK PROGRAM FAILURE"},
-    {CL_DEVICE_PARTITION_FAILED,                        "DEVICE PARTITION FAILED"},
-    {CL_KERNEL_ARG_INFO_NOT_AVAILABLE,                  "KERNEL ARG INFO NOT AVAILABLE"},
-    {CL_INVALID_VALUE,                                  "INVALID VALUE"},
-    {CL_INVALID_DEVICE_TYPE,                            "INVALID DEVICE TYPE"},
-    {CL_INVALID_PLATFORM,                               "INVALID PLATFORM"},
-    {CL_INVALID_DEVICE,                                 "INVALID DEVICE"},
-    {CL_INVALID_CONTEXT,                                "INVALID CONTEXT"},
-    {CL_INVALID_QUEUE_PROPERTIES,                       "INVALID QUEUE PROPERTIES"},
-    {CL_INVALID_COMMAND_QUEUE,                          "INVALID COMMAND QUEUE"},
-    {CL_INVALID_HOST_PTR,                               "INVALID HOST PTR"},
-    {CL_INVALID_MEM_OBJECT,                             "INVALID MEM OBJECT"},
-    {CL_INVALID_IMAGE_FORMAT_DESCRIPTOR,                "INVALID IMAGE FORMAT DESCRIPTOR"},
-    {CL_INVALID_IMAGE_SIZE,                             "INVALID IMAGE SIZE"},
-    {CL_INVALID_SAMPLER,                                "INVALID SAMPLER"},
-    {CL_INVALID_BINARY,                                 "INVALID BINARY"},
-    {CL_INVALID_BUILD_OPTIONS,                          "INVALID BUILD OPTIONS"},
-    {CL_INVALID_PROGRAM,                                "INVALID PROGRAM"},
-    {CL_INVALID_PROGRAM_EXECUTABLE,                     "INVALID PROGRAM EXECUTABLE"},
-    {CL_INVALID_KERNEL_NAME,                            "INVALID KERNEL NAME"},
-    {CL_INVALID_KERNEL_DEFINITION,                      "INVALID KERNEL DEFINITION"},
-    {CL_INVALID_KERNEL,                                 "INVALID KERNEL"},
-    {CL_INVALID_ARG_INDEX,                              "INVALID ARG INDEX"},
-    {CL_INVALID_ARG_VALUE,                              "INVALID ARG VALUE"},
-    {CL_INVALID_ARG_SIZE,                               "INVALID ARG_SIZE"},
-    {CL_INVALID_KERNEL_ARGS,                            "INVALID KERNEL ARGS"},
-    {CL_INVALID_WORK_DIMENSION,                         "INVALID WORK DIMENSION"},
-    {CL_INVALID_WORK_GROUP_SIZE,                        "INVALID WORK GROUP SIZE"},
-    {CL_INVALID_WORK_ITEM_SIZE,                         "INVALID WORK ITEM SIZE"},
-    {CL_INVALID_GLOBAL_OFFSET,                          "INVALID GLOBAL OFFSET"},
-    {CL_INVALID_EVENT_WAIT_LIST,                        "INVALID EVENT WAIT LIST"},
-    {CL_INVALID_EVENT,                                  "INVALID EVENT"},
-    {CL_INVALID_OPERATION,                              "INVALID OPERATION"},
-    {CL_INVALID_GL_OBJECT,                              "INVALID GL OBJECT"},
-    {CL_INVALID_BUFFER_SIZE,                            "INVALID BUFFER SIZE"},
-    {CL_INVALID_MIP_LEVEL,                              "INVALID MIP LEVEL"},
-    {CL_INVALID_GLOBAL_WORK_SIZE,                       "INVALID GLOBAL WORK SIZE"},
-    {CL_INVALID_PROPERTY,                               "INVALID PROPERTY"},
-    {CL_INVALID_IMAGE_DESCRIPTOR,                       "INVALID IMAGE DESCRIPTOR"},
-    {CL_INVALID_COMPILER_OPTIONS,                       "INVALID COMPILER OPTIONS"},
-    {CL_INVALID_LINKER_OPTIONS,                         "INVALID LINKER OPTIONS"},
-    {CL_INVALID_DEVICE_PARTITION_COUNT,                 "INVALID DEVICE PARTITION COUNT"},
-};
-
-const char *av_opencl_errstr(cl_int status)
-{
-    int i;
-    for (i = 0; i < FF_ARRAY_ELEMS(opencl_err_msg); i++) {
-        if (opencl_err_msg[i].err_code == status)
-            return opencl_err_msg[i].err_str;
-    }
-    return "unknown error";
-}
-
-static void free_device_list(AVOpenCLDeviceList *device_list)
-{
-    int i, j;
-    if (!device_list || !device_list->platform_node)
-        return;
-    for (i = 0; i < device_list->platform_num; i++) {
-        if (!device_list->platform_node[i])
-            continue;
-        for (j = 0; j < device_list->platform_node[i]->device_num; j++) {
-            av_freep(&(device_list->platform_node[i]->device_node[j]->device_name));
-            av_freep(&(device_list->platform_node[i]->device_node[j]));
-        }
-        av_freep(&device_list->platform_node[i]->device_node);
-        av_freep(&(device_list->platform_node[i]->platform_name));
-        av_freep(&device_list->platform_node[i]);
-    }
-    av_freep(&device_list->platform_node);
-    device_list->platform_num = 0;
-}
-
-static int get_device_list(AVOpenCLDeviceList *device_list)
-{
-    cl_int status;
-    int i, j, k, device_num, total_devices_num, ret = 0;
-    int *devices_num;
-    cl_platform_id *platform_ids = NULL;
-    cl_device_id *device_ids = NULL;
-    AVOpenCLDeviceNode *device_node = NULL;
-    size_t platform_name_size = 0;
-    size_t device_name_size = 0;
-    status = clGetPlatformIDs(0, NULL, &device_list->platform_num);
-    if (status != CL_SUCCESS) {
-        av_log(&opencl_ctx, AV_LOG_ERROR,
-               "Could not get OpenCL platform ids: %s\n", av_opencl_errstr(status));
-        return AVERROR_EXTERNAL;
-    }
-    platform_ids = av_mallocz_array(device_list->platform_num, sizeof(cl_platform_id));
-    if (!platform_ids)
-        return AVERROR(ENOMEM);
-    status = clGetPlatformIDs(device_list->platform_num, platform_ids, NULL);
-    if (status != CL_SUCCESS) {
-        av_log(&opencl_ctx, AV_LOG_ERROR,
-                "Could not get OpenCL platform ids: %s\n", av_opencl_errstr(status));
-        ret = AVERROR_EXTERNAL;
-        goto end;
-    }
-    device_list->platform_node = av_mallocz_array(device_list->platform_num, sizeof(AVOpenCLPlatformNode *));
-    if (!device_list->platform_node) {
-        ret = AVERROR(ENOMEM);
-        goto end;
-    }
-    devices_num = av_mallocz(sizeof(int) * FF_ARRAY_ELEMS(device_type));
-    if (!devices_num) {
-        ret = AVERROR(ENOMEM);
-        goto end;
-    }
-    for (i = 0; i < device_list->platform_num; i++) {
-        device_list->platform_node[i] = av_mallocz(sizeof(AVOpenCLPlatformNode));
-        if (!device_list->platform_node[i]) {
-            ret = AVERROR(ENOMEM);
-            goto end;
-        }
-        device_list->platform_node[i]->platform_id = platform_ids[i];
-        status = clGetPlatformInfo(platform_ids[i], CL_PLATFORM_VENDOR,
-                                   0, NULL, &platform_name_size);
-        if (status != CL_SUCCESS) {
-            av_log(&opencl_ctx, AV_LOG_WARNING,
-                    "Could not get size of platform name: %s\n", av_opencl_errstr(status));
-        } else {
-            device_list->platform_node[i]->platform_name = av_malloc(platform_name_size * sizeof(char));
-            if (!device_list->platform_node[i]->platform_name) {
-                av_log(&opencl_ctx, AV_LOG_WARNING,
-                        "Could not allocate memory for device name: %s\n", av_opencl_errstr(status));
-            } else {
-                status = clGetPlatformInfo(platform_ids[i], CL_PLATFORM_VENDOR,
-                                           platform_name_size * sizeof(char),
-                                           device_list->platform_node[i]->platform_name, NULL);
-                if (status != CL_SUCCESS) {
-                    av_log(&opencl_ctx, AV_LOG_WARNING,
-                            "Could not get platform name: %s\n", av_opencl_errstr(status));
-                }
-            }
-        }
-        total_devices_num = 0;
-        for (j = 0; j < FF_ARRAY_ELEMS(device_type); j++) {
-            status = clGetDeviceIDs(device_list->platform_node[i]->platform_id,
-                                    device_type[j], 0, NULL, &devices_num[j]);
-            total_devices_num += devices_num[j];
-        }
-        device_list->platform_node[i]->device_node = av_mallocz_array(total_devices_num, sizeof(AVOpenCLDeviceNode *));
-        if (!device_list->platform_node[i]->device_node) {
-            ret = AVERROR(ENOMEM);
-            goto end;
-        }
-        for (j = 0; j < FF_ARRAY_ELEMS(device_type); j++) {
-            if (devices_num[j]) {
-                device_ids = av_mallocz_array(devices_num[j], sizeof(cl_device_id));
-                if (!device_ids) {
-                    ret = AVERROR(ENOMEM);
-                    goto end;
-                }
-                status = clGetDeviceIDs(device_list->platform_node[i]->platform_id, device_type[j],
-                                        devices_num[j], device_ids, NULL);
-                if (status != CL_SUCCESS) {
-                    av_log(&opencl_ctx, AV_LOG_WARNING,
-                            "Could not get device ID: %s:\n", av_opencl_errstr(status));
-                    av_freep(&device_ids);
-                    continue;
-                }
-                for (k = 0; k < devices_num[j]; k++) {
-                    device_num = device_list->platform_node[i]->device_num;
-                    device_list->platform_node[i]->device_node[device_num] = av_mallocz(sizeof(AVOpenCLDeviceNode));
-                    if (!device_list->platform_node[i]->device_node[device_num]) {
-                        ret = AVERROR(ENOMEM);
-                        goto end;
-                    }
-                    device_node = device_list->platform_node[i]->device_node[device_num];
-                    device_node->device_id = device_ids[k];
-                    device_node->device_type = device_type[j];
-                    status = clGetDeviceInfo(device_node->device_id, CL_DEVICE_NAME,
-                                             0, NULL, &device_name_size);
-                    if (status != CL_SUCCESS) {
-                        av_log(&opencl_ctx, AV_LOG_WARNING,
-                                "Could not get size of device name: %s\n", av_opencl_errstr(status));
-                        continue;
-                    }
-                    device_node->device_name = av_malloc(device_name_size * sizeof(char));
-                    if (!device_node->device_name) {
-                        av_log(&opencl_ctx, AV_LOG_WARNING,
-                                "Could not allocate memory for device name: %s\n", av_opencl_errstr(status));
-                        continue;
-                    }
-                    status = clGetDeviceInfo(device_node->device_id, CL_DEVICE_NAME,
-                                             device_name_size * sizeof(char),
-                                             device_node->device_name, NULL);
-                    if (status != CL_SUCCESS) {
-                        av_log(&opencl_ctx, AV_LOG_WARNING,
-                                "Could not get device name: %s\n", av_opencl_errstr(status));
-                        continue;
-                    }
-                    device_list->platform_node[i]->device_num++;
-                }
-                av_freep(&device_ids);
-            }
-        }
-    }
-end:
-    av_freep(&platform_ids);
-    av_freep(&devices_num);
-    av_freep(&device_ids);
-    if (ret < 0)
-        free_device_list(device_list);
-    return ret;
-}
-
-int av_opencl_get_device_list(AVOpenCLDeviceList **device_list)
-{
-    int ret = 0;
-    *device_list = av_mallocz(sizeof(AVOpenCLDeviceList));
-    if (!(*device_list)) {
-        av_log(&opencl_ctx, AV_LOG_ERROR, "Could not allocate opencl device list\n");
-        return AVERROR(ENOMEM);
-    }
-    ret = get_device_list(*device_list);
-    if (ret < 0) {
-        av_log(&opencl_ctx, AV_LOG_ERROR, "Could not get device list from environment\n");
-        free_device_list(*device_list);
-        av_freep(device_list);
-        return ret;
-    }
-    return ret;
-}
-
-void av_opencl_free_device_list(AVOpenCLDeviceList **device_list)
-{
-    free_device_list(*device_list);
-    av_freep(device_list);
-}
-
-static inline int init_opencl_mtx(void)
-{
-#if HAVE_THREADS
-    if (!atomic_opencl_lock) {
-        int err;
-        pthread_mutex_t *tmp = av_malloc(sizeof(pthread_mutex_t));
-        if (!tmp)
-            return AVERROR(ENOMEM);
-        if ((err = pthread_mutex_init(tmp, NULL))) {
-            av_free(tmp);
-            return AVERROR(err);
-        }
-        if (avpriv_atomic_ptr_cas((void * volatile *)&atomic_opencl_lock, NULL, tmp)) {
-            pthread_mutex_destroy(tmp);
-            av_free(tmp);
-        }
-    }
-#endif
-    return 0;
-}
-
-int av_opencl_set_option(const char *key, const char *val)
-{
-    int ret = init_opencl_mtx( );
-    if (ret < 0)
-        return ret;
-    LOCK_OPENCL;
-    if (!opencl_ctx.opt_init_flag) {
-        av_opt_set_defaults(&opencl_ctx);
-        opencl_ctx.opt_init_flag = 1;
-    }
-    ret = av_opt_set(&opencl_ctx, key, val, 0);
-    UNLOCK_OPENCL;
-    return ret;
-}
-
-int av_opencl_get_option(const char *key, uint8_t **out_val)
-{
-    int ret = 0;
-    LOCK_OPENCL;
-    ret = av_opt_get(&opencl_ctx, key, 0, out_val);
-    UNLOCK_OPENCL;
-    return ret;
-}
-
-void av_opencl_free_option(void)
-{
-    /*FIXME: free openclutils context*/
-    LOCK_OPENCL;
-    av_opt_free(&opencl_ctx);
-    UNLOCK_OPENCL;
-}
-
-AVOpenCLExternalEnv *av_opencl_alloc_external_env(void)
-{
-    AVOpenCLExternalEnv *ext = av_mallocz(sizeof(AVOpenCLExternalEnv));
-    if (!ext) {
-        av_log(&opencl_ctx, AV_LOG_ERROR,
-               "Could not malloc external opencl environment data space\n");
-    }
-    return ext;
-}
-
-void av_opencl_free_external_env(AVOpenCLExternalEnv **ext_opencl_env)
-{
-    av_freep(ext_opencl_env);
-}
-
-int av_opencl_register_kernel_code(const char *kernel_code)
-{
-    int i, ret = init_opencl_mtx( );
-    if (ret < 0)
-        return ret;
-    LOCK_OPENCL;
-    if (opencl_ctx.kernel_code_count >= MAX_KERNEL_CODE_NUM) {
-        av_log(&opencl_ctx, AV_LOG_ERROR,
-               "Could not register kernel code, maximum number of registered kernel code %d already reached\n",
-               MAX_KERNEL_CODE_NUM);
-        ret = AVERROR(EINVAL);
-        goto end;
-    }
-    for (i = 0; i < opencl_ctx.kernel_code_count; i++) {
-        if (opencl_ctx.kernel_code[i].kernel_string == kernel_code) {
-            av_log(&opencl_ctx, AV_LOG_WARNING, "Same kernel code has been registered\n");
-            goto end;
-        }
-    }
-    opencl_ctx.kernel_code[opencl_ctx.kernel_code_count].kernel_string = kernel_code;
-    opencl_ctx.kernel_code[opencl_ctx.kernel_code_count].is_compiled = 0;
-    opencl_ctx.kernel_code_count++;
-end:
-    UNLOCK_OPENCL;
-    return ret;
-}
-
-cl_program av_opencl_compile(const char *program_name, const char *build_opts)
-{
-    int i;
-    cl_int status, build_status;
-    int kernel_code_idx = 0;
-    const char *kernel_source = NULL;
-    size_t kernel_code_len;
-    char* ptr = NULL;
-    cl_program program = NULL;
-    size_t log_size;
-    char *log = NULL;
-
-    LOCK_OPENCL;
-    for (i = 0; i < opencl_ctx.kernel_code_count; i++) {
-        // identify a program using a unique name within the kernel source
-        ptr = av_stristr(opencl_ctx.kernel_code[i].kernel_string, program_name);
-        if (ptr && !opencl_ctx.kernel_code[i].is_compiled) {
-            kernel_source = opencl_ctx.kernel_code[i].kernel_string;
-            kernel_code_len = strlen(opencl_ctx.kernel_code[i].kernel_string);
-            kernel_code_idx = i;
-            break;
-        }
-    }
-    if (!kernel_source) {
-        av_log(&opencl_ctx, AV_LOG_ERROR,
-               "Unable to find OpenCL kernel source '%s'\n", program_name);
-        goto end;
-    }
-
-    /* create a CL program from kernel source */
-    program = clCreateProgramWithSource(opencl_ctx.context, 1, &kernel_source, &kernel_code_len, &status);
-    if(status != CL_SUCCESS) {
-        av_log(&opencl_ctx, AV_LOG_ERROR,
-               "Unable to create OpenCL program '%s': %s\n", program_name, av_opencl_errstr(status));
-        program = NULL;
-        goto end;
-    }
-
-    build_status = clBuildProgram(program, 1, &(opencl_ctx.device_id), build_opts, NULL, NULL);
-    status = clGetProgramBuildInfo(program, opencl_ctx.device_id,
-                                   CL_PROGRAM_BUILD_LOG, 0, NULL, &log_size);
-    if (status != CL_SUCCESS) {
-        av_log(&opencl_ctx, AV_LOG_WARNING,
-               "Failed to get compilation log: %s\n",
-               av_opencl_errstr(status));
-    } else {
-        log = av_malloc(log_size);
-        if (log) {
-            status = clGetProgramBuildInfo(program, opencl_ctx.device_id,
-                                           CL_PROGRAM_BUILD_LOG, log_size,
-                                           log, NULL);
-            if (status != CL_SUCCESS) {
-                av_log(&opencl_ctx, AV_LOG_WARNING,
-                       "Failed to get compilation log: %s\n",
-                       av_opencl_errstr(status));
-            } else {
-                int level = build_status == CL_SUCCESS ? AV_LOG_DEBUG :
-                                                         AV_LOG_ERROR;
-                av_log(&opencl_ctx, level, "Compilation log:\n%s\n", log);
-            }
-        }
-        av_freep(&log);
-    }
-    if (build_status != CL_SUCCESS) {
-        av_log(&opencl_ctx, AV_LOG_ERROR,
-               "Compilation failed with OpenCL program '%s': %s\n",
-               program_name, av_opencl_errstr(build_status));
-        program = NULL;
-        goto end;
-    }
-
-    opencl_ctx.kernel_code[kernel_code_idx].is_compiled = 1;
-end:
-    UNLOCK_OPENCL;
-    return program;
-}
-
-cl_command_queue av_opencl_get_command_queue(void)
-{
-    return opencl_ctx.command_queue;
-}
-
-static int init_opencl_env(OpenclContext *opencl_ctx, AVOpenCLExternalEnv *ext_opencl_env)
-{
-    cl_int status;
-    cl_context_properties cps[3];
-    int i, ret = 0;
-    AVOpenCLDeviceNode *device_node = NULL;
-
-    if (ext_opencl_env) {
-        if (opencl_ctx->is_user_created)
-            return 0;
-        opencl_ctx->platform_id     = ext_opencl_env->platform_id;
-        opencl_ctx->is_user_created = 1;
-        opencl_ctx->command_queue   = ext_opencl_env->command_queue;
-        opencl_ctx->context         = ext_opencl_env->context;
-        opencl_ctx->device_id       = ext_opencl_env->device_id;
-        opencl_ctx->device_type     = ext_opencl_env->device_type;
-    } else {
-        if (!opencl_ctx->is_user_created) {
-            if (!opencl_ctx->device_list.platform_num) {
-                ret = get_device_list(&opencl_ctx->device_list);
-                if (ret < 0) {
-                    return ret;
-                }
-            }
-            if (opencl_ctx->platform_idx >= 0) {
-                if (opencl_ctx->device_list.platform_num < opencl_ctx->platform_idx + 1) {
-                    av_log(opencl_ctx, AV_LOG_ERROR, "User set platform index not exist\n");
-                    return AVERROR(EINVAL);
-                }
-                if (!opencl_ctx->device_list.platform_node[opencl_ctx->platform_idx]->device_num) {
-                    av_log(opencl_ctx, AV_LOG_ERROR, "No devices in user specific platform with index %d\n",
-                           opencl_ctx->platform_idx);
-                    return AVERROR(EINVAL);
-                }
-                opencl_ctx->platform_id = opencl_ctx->device_list.platform_node[opencl_ctx->platform_idx]->platform_id;
-            } else {
-                /* get a usable platform by default*/
-                for (i = 0; i < opencl_ctx->device_list.platform_num; i++) {
-                    if (opencl_ctx->device_list.platform_node[i]->device_num) {
-                        opencl_ctx->platform_id = opencl_ctx->device_list.platform_node[i]->platform_id;
-                        opencl_ctx->platform_idx = i;
-                        break;
-                    }
-                }
-            }
-            if (!opencl_ctx->platform_id) {
-                av_log(opencl_ctx, AV_LOG_ERROR, "Could not get OpenCL platforms\n");
-                return AVERROR_EXTERNAL;
-            }
-            /* get a usable device*/
-            if (opencl_ctx->device_idx >= 0) {
-                if (opencl_ctx->device_list.platform_node[opencl_ctx->platform_idx]->device_num < opencl_ctx->device_idx + 1) {
-                    av_log(opencl_ctx, AV_LOG_ERROR,
-                           "Could not get OpenCL device idx %d in the user set platform\n", opencl_ctx->platform_idx);
-                    return AVERROR(EINVAL);
-                }
-            } else {
-                opencl_ctx->device_idx = 0;
-            }
-
-            device_node = opencl_ctx->device_list.platform_node[opencl_ctx->platform_idx]->device_node[opencl_ctx->device_idx];
-            opencl_ctx->device_id = device_node->device_id;
-            opencl_ctx->device_type = device_node->device_type;
-
-            /*
-             * Use available platform.
-             */
-            av_log(opencl_ctx, AV_LOG_VERBOSE, "Platform Name: %s, Device Name: %s\n",
-                   opencl_ctx->device_list.platform_node[opencl_ctx->platform_idx]->platform_name,
-                   device_node->device_name);
-            cps[0] = CL_CONTEXT_PLATFORM;
-            cps[1] = (cl_context_properties)opencl_ctx->platform_id;
-            cps[2] = 0;
-
-            opencl_ctx->context = clCreateContextFromType(cps, opencl_ctx->device_type,
-                                                       NULL, NULL, &status);
-            if (status != CL_SUCCESS) {
-                av_log(opencl_ctx, AV_LOG_ERROR,
-                       "Could not get OpenCL context from device type: %s\n", av_opencl_errstr(status));
-                return AVERROR_EXTERNAL;
-            }
-            opencl_ctx->command_queue = clCreateCommandQueue(opencl_ctx->context, opencl_ctx->device_id,
-                                                          0, &status);
-            if (status != CL_SUCCESS) {
-                av_log(opencl_ctx, AV_LOG_ERROR,
-                       "Could not create OpenCL command queue: %s\n", av_opencl_errstr(status));
-                return AVERROR_EXTERNAL;
-            }
-        }
-    }
-    return ret;
-}
-
-int av_opencl_init(AVOpenCLExternalEnv *ext_opencl_env)
-{
-    int ret = init_opencl_mtx( );
-    if (ret < 0)
-        return ret;
-    LOCK_OPENCL;
-    if (!opencl_ctx.init_count) {
-        if (!opencl_ctx.opt_init_flag) {
-            av_opt_set_defaults(&opencl_ctx);
-            opencl_ctx.opt_init_flag = 1;
-        }
-        ret = init_opencl_env(&opencl_ctx, ext_opencl_env);
-        if (ret < 0)
-            goto end;
-        if (opencl_ctx.kernel_code_count <= 0) {
-            av_log(&opencl_ctx, AV_LOG_ERROR,
-                   "No kernel code is registered, compile kernel file failed\n");
-            ret = AVERROR(EINVAL);
-            goto end;
-        }
-    }
-    opencl_ctx.init_count++;
-end:
-    UNLOCK_OPENCL;
-    return ret;
-}
-
-void av_opencl_uninit(void)
-{
-    int i;
-    cl_int status;
-    LOCK_OPENCL;
-    opencl_ctx.init_count--;
-    if (opencl_ctx.is_user_created)
-        goto end;
-    if (opencl_ctx.init_count > 0)
-        goto end;
-    if (opencl_ctx.command_queue) {
-        status = clReleaseCommandQueue(opencl_ctx.command_queue);
-        if (status != CL_SUCCESS) {
-            av_log(&opencl_ctx, AV_LOG_ERROR,
-                   "Could not release OpenCL command queue: %s\n", av_opencl_errstr(status));
-        }
-        opencl_ctx.command_queue = NULL;
-    }
-    if (opencl_ctx.context) {
-        status = clReleaseContext(opencl_ctx.context);
-        if (status != CL_SUCCESS) {
-            av_log(&opencl_ctx, AV_LOG_ERROR,
-                   "Could not release OpenCL context: %s\n", av_opencl_errstr(status));
-        }
-        opencl_ctx.context = NULL;
-    }
-    for (i = 0; i < opencl_ctx.kernel_code_count; i++) {
-        opencl_ctx.kernel_code[i].is_compiled = 0;
-    }
-    free_device_list(&opencl_ctx.device_list);
-end:
-    if (opencl_ctx.init_count <= 0)
-        av_opt_free(&opencl_ctx); //FIXME: free openclutils context
-    UNLOCK_OPENCL;
-}
-
-int av_opencl_buffer_create(cl_mem *cl_buf, size_t cl_buf_size, int flags, void *host_ptr)
-{
-    cl_int status;
-    *cl_buf = clCreateBuffer(opencl_ctx.context, flags, cl_buf_size, host_ptr, &status);
-    if (status != CL_SUCCESS) {
-        av_log(&opencl_ctx, AV_LOG_ERROR, "Could not create OpenCL buffer: %s\n", av_opencl_errstr(status));
-        return AVERROR_EXTERNAL;
-    }
-    return 0;
-}
-
-void av_opencl_buffer_release(cl_mem *cl_buf)
-{
-    cl_int status = 0;
-    if (!cl_buf)
-        return;
-    status = clReleaseMemObject(*cl_buf);
-    if (status != CL_SUCCESS) {
-        av_log(&opencl_ctx, AV_LOG_ERROR,
-               "Could not release OpenCL buffer: %s\n", av_opencl_errstr(status));
-    }
-    memset(cl_buf, 0, sizeof(*cl_buf));
-}
-
-int av_opencl_buffer_write(cl_mem dst_cl_buf, uint8_t *src_buf, size_t buf_size)
-{
-    cl_int status;
-    void *mapped = clEnqueueMapBuffer(opencl_ctx.command_queue, dst_cl_buf,
-                                      CL_TRUE, CL_MAP_WRITE, 0, sizeof(uint8_t) * buf_size,
-                                      0, NULL, NULL, &status);
-
-    if (status != CL_SUCCESS) {
-        av_log(&opencl_ctx, AV_LOG_ERROR,
-               "Could not map OpenCL buffer: %s\n", av_opencl_errstr(status));
-        return AVERROR_EXTERNAL;
-    }
-    memcpy(mapped, src_buf, buf_size);
-
-    status = clEnqueueUnmapMemObject(opencl_ctx.command_queue, dst_cl_buf, mapped, 0, NULL, NULL);
-    if (status != CL_SUCCESS) {
-        av_log(&opencl_ctx, AV_LOG_ERROR,
-               "Could not unmap OpenCL buffer: %s\n", av_opencl_errstr(status));
-        return AVERROR_EXTERNAL;
-    }
-    return 0;
-}
-
-int av_opencl_buffer_read(uint8_t *dst_buf, cl_mem src_cl_buf, size_t buf_size)
-{
-    cl_int status;
-    void *mapped = clEnqueueMapBuffer(opencl_ctx.command_queue, src_cl_buf,
-                                      CL_TRUE, CL_MAP_READ, 0, buf_size,
-                                      0, NULL, NULL, &status);
-
-    if (status != CL_SUCCESS) {
-        av_log(&opencl_ctx, AV_LOG_ERROR,
-               "Could not map OpenCL buffer: %s\n", av_opencl_errstr(status));
-        return AVERROR_EXTERNAL;
-    }
-    memcpy(dst_buf, mapped, buf_size);
-
-    status = clEnqueueUnmapMemObject(opencl_ctx.command_queue, src_cl_buf, mapped, 0, NULL, NULL);
-    if (status != CL_SUCCESS) {
-        av_log(&opencl_ctx, AV_LOG_ERROR,
-               "Could not unmap OpenCL buffer: %s\n", av_opencl_errstr(status));
-        return AVERROR_EXTERNAL;
-    }
-    return 0;
-}
-
-int av_opencl_buffer_write_image(cl_mem dst_cl_buf, size_t cl_buffer_size, int dst_cl_offset,
-                                 uint8_t **src_data, int *plane_size, int plane_num)
-{
-    int i, buffer_size = 0;
-    uint8_t *temp;
-    cl_int status;
-    void *mapped;
-    if ((unsigned int)plane_num > 8) {
-        return AVERROR(EINVAL);
-    }
-    for (i = 0;i < plane_num;i++) {
-        buffer_size += plane_size[i];
-    }
-    if (buffer_size > cl_buffer_size) {
-        av_log(&opencl_ctx, AV_LOG_ERROR,
-               "Cannot write image to OpenCL buffer: buffer too small\n");
-        return AVERROR(EINVAL);
-    }
-    mapped = clEnqueueMapBuffer(opencl_ctx.command_queue, dst_cl_buf,
-                                CL_TRUE, CL_MAP_WRITE, 0, buffer_size + dst_cl_offset,
-                                0, NULL, NULL, &status);
-    if (status != CL_SUCCESS) {
-        av_log(&opencl_ctx, AV_LOG_ERROR,
-               "Could not map OpenCL buffer: %s\n", av_opencl_errstr(status));
-        return AVERROR_EXTERNAL;
-    }
-    temp = mapped;
-    temp += dst_cl_offset;
-    for (i = 0; i < plane_num; i++) {
-        memcpy(temp, src_data[i], plane_size[i]);
-        temp += plane_size[i];
-    }
-    status = clEnqueueUnmapMemObject(opencl_ctx.command_queue, dst_cl_buf, mapped, 0, NULL, NULL);
-    if (status != CL_SUCCESS) {
-        av_log(&opencl_ctx, AV_LOG_ERROR,
-               "Could not unmap OpenCL buffer: %s\n", av_opencl_errstr(status));
-        return AVERROR_EXTERNAL;
-    }
-    return 0;
-}
-
-int av_opencl_buffer_read_image(uint8_t **dst_data, int *plane_size, int plane_num,
-                                cl_mem src_cl_buf, size_t cl_buffer_size)
-{
-    int i,buffer_size = 0,ret = 0;
-    uint8_t *temp;
-    void *mapped;
-    cl_int status;
-    if ((unsigned int)plane_num > 8) {
-        return AVERROR(EINVAL);
-    }
-    for (i = 0; i < plane_num; i++) {
-        buffer_size += plane_size[i];
-    }
-    if (buffer_size > cl_buffer_size) {
-        av_log(&opencl_ctx, AV_LOG_ERROR,
-               "Cannot write image to CPU buffer: OpenCL buffer too small\n");
-        return AVERROR(EINVAL);
-    }
-    mapped = clEnqueueMapBuffer(opencl_ctx.command_queue, src_cl_buf,
-                                CL_TRUE, CL_MAP_READ, 0, buffer_size,
-                                0, NULL, NULL, &status);
-
-    if (status != CL_SUCCESS) {
-        av_log(&opencl_ctx, AV_LOG_ERROR,
-               "Could not map OpenCL buffer: %s\n", av_opencl_errstr(status));
-        return AVERROR_EXTERNAL;
-    }
-    temp = mapped;
-    if (ret >= 0) {
-        for (i = 0; i < plane_num; i++) {
-            memcpy(dst_data[i], temp, plane_size[i]);
-            temp += plane_size[i];
-        }
-    }
-    status = clEnqueueUnmapMemObject(opencl_ctx.command_queue, src_cl_buf, mapped, 0, NULL, NULL);
-    if (status != CL_SUCCESS) {
-        av_log(&opencl_ctx, AV_LOG_ERROR,
-               "Could not unmap OpenCL buffer: %s\n", av_opencl_errstr(status));
-        return AVERROR_EXTERNAL;
-    }
-    return 0;
-}
-
-int64_t av_opencl_benchmark(AVOpenCLDeviceNode *device_node, cl_platform_id platform,
-                            int64_t (*benchmark)(AVOpenCLExternalEnv *ext_opencl_env))
-{
-    int64_t ret = 0;
-    cl_int status;
-    cl_context_properties cps[3];
-    AVOpenCLExternalEnv *ext_opencl_env = NULL;
-
-    ext_opencl_env = av_opencl_alloc_external_env();
-    ext_opencl_env->device_id = device_node->device_id;
-    ext_opencl_env->device_type = device_node->device_type;
-    av_log(&opencl_ctx, AV_LOG_VERBOSE, "Performing test on OpenCL device %s\n",
-           device_node->device_name);
-
-    cps[0] = CL_CONTEXT_PLATFORM;
-    cps[1] = (cl_context_properties)platform;
-    cps[2] = 0;
-    ext_opencl_env->context = clCreateContextFromType(cps, ext_opencl_env->device_type,
-                                                      NULL, NULL, &status);
-    if (status != CL_SUCCESS || !ext_opencl_env->context) {
-        ret = AVERROR_EXTERNAL;
-        goto end;
-    }
-    ext_opencl_env->command_queue = clCreateCommandQueue(ext_opencl_env->context,
-                                                         ext_opencl_env->device_id, 0, &status);
-    if (status != CL_SUCCESS || !ext_opencl_env->command_queue) {
-        ret = AVERROR_EXTERNAL;
-        goto end;
-    }
-    ret = benchmark(ext_opencl_env);
-    if (ret < 0)
-        av_log(&opencl_ctx, AV_LOG_ERROR, "Benchmark failed with OpenCL device %s\n",
-               device_node->device_name);
-end:
-    if (ext_opencl_env->command_queue)
-        clReleaseCommandQueue(ext_opencl_env->command_queue);
-    if (ext_opencl_env->context)
-        clReleaseContext(ext_opencl_env->context);
-    av_opencl_free_external_env(&ext_opencl_env);
-    return ret;
-}
diff --git a/libavutil/opencl.h b/libavutil/opencl.h
deleted file mode 100644
index b709927c42..0000000000
--- a/libavutil/opencl.h
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * Copyright (C) 2012 Peng  Gao     <peng@multicorewareinc.com>
- * Copyright (C) 2012 Li    Cao     <li@multicorewareinc.com>
- * Copyright (C) 2012 Wei   Gao     <weigao@multicorewareinc.com>
- * Copyright (C) 2013 Lenny Wang    <lwanghpc@gmail.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * OpenCL wrapper
- *
- * This interface is considered still experimental and its API and ABI may
- * change without prior notice.
- */
-
-#ifndef AVUTIL_OPENCL_H
-#define AVUTIL_OPENCL_H
-
-#define CL_USE_DEPRECATED_OPENCL_1_2_APIS 1
-#ifdef __APPLE__
-#include <OpenCL/cl.h>
-#else
-#include <CL/cl.h>
-#endif
-#include <stdint.h>
-#include "dict.h"
-
-#include "libavutil/version.h"
-
-#define AV_OPENCL_KERNEL( ... )# __VA_ARGS__
-
-typedef struct {
-    int device_type;
-    char *device_name;
-    cl_device_id device_id;
-} AVOpenCLDeviceNode;
-
-typedef struct {
-    cl_platform_id platform_id;
-    char *platform_name;
-    int device_num;
-    AVOpenCLDeviceNode **device_node;
-} AVOpenCLPlatformNode;
-
-typedef struct {
-    int platform_num;
-    AVOpenCLPlatformNode **platform_node;
-} AVOpenCLDeviceList;
-
-typedef struct {
-    cl_platform_id platform_id;
-    cl_device_type device_type;
-    cl_context context;
-    cl_device_id  device_id;
-    cl_command_queue command_queue;
-    char *platform_name;
-} AVOpenCLExternalEnv;
-
-/**
- * Get OpenCL device list.
- *
- * It must be freed with av_opencl_free_device_list().
- *
- * @param device_list pointer to OpenCL environment device list,
- *                    should be released by av_opencl_free_device_list()
- *
- * @return  >=0 on success, a negative error code in case of failure
- */
-int av_opencl_get_device_list(AVOpenCLDeviceList **device_list);
-
-/**
-  * Free OpenCL device list.
-  *
-  * @param device_list pointer to OpenCL environment device list
-  *                       created by av_opencl_get_device_list()
-  */
-void av_opencl_free_device_list(AVOpenCLDeviceList **device_list);
-
-/**
- * Set option in the global OpenCL context.
- *
- * This options affect the operation performed by the next
- * av_opencl_init() operation.
- *
- * The currently accepted options are:
- * - platform: set index of platform in device list
- * - device: set index of device in device list
- *
- * See reference "OpenCL Specification Version: 1.2 chapter 5.6.4".
- *
- * @param key                 option key
- * @param val                 option value
- * @return >=0 on success, a negative error code in case of failure
- * @see av_opencl_get_option()
- */
-int av_opencl_set_option(const char *key, const char *val);
-
-/**
- * Get option value from the global OpenCL context.
- *
- * @param key        option key
- * @param out_val  pointer to location where option value will be
- *                         written, must be freed with av_freep()
- * @return  >=0 on success, a negative error code in case of failure
- * @see av_opencl_set_option()
- */
-int av_opencl_get_option(const char *key, uint8_t **out_val);
-
-/**
- * Free option values of the global OpenCL context.
- *
- */
-void av_opencl_free_option(void);
-
-/**
- * Allocate OpenCL external environment.
- *
- * It must be freed with av_opencl_free_external_env().
- *
- * @return pointer to allocated OpenCL external environment
- */
-AVOpenCLExternalEnv *av_opencl_alloc_external_env(void);
-
-/**
- * Free OpenCL external environment.
- *
- * @param ext_opencl_env pointer to OpenCL external environment
- *                       created by av_opencl_alloc_external_env()
- */
-void av_opencl_free_external_env(AVOpenCLExternalEnv **ext_opencl_env);
-
-/**
- * Get OpenCL error string.
- *
- * @param status    OpenCL error code
- * @return OpenCL error string
- */
-const char *av_opencl_errstr(cl_int status);
-
-/**
- * Register kernel code.
- *
- *  The registered kernel code is stored in a global context, and compiled
- *  in the runtime environment when av_opencl_init() is called.
- *
- * @param kernel_code    kernel code to be compiled in the OpenCL runtime environment
- * @return  >=0 on success, a negative error code in case of failure
- */
-int av_opencl_register_kernel_code(const char *kernel_code);
-
-/**
- * Initialize the run time OpenCL environment
- *
- * @param ext_opencl_env external OpenCL environment, created by an
- *                       application program, ignored if set to NULL
- * @return >=0 on success, a negative error code in case of failure
- */
-int av_opencl_init(AVOpenCLExternalEnv *ext_opencl_env);
-
-/**
- * compile specific OpenCL kernel source
- *
- * @param program_name  pointer to a program name used for identification
- * @param build_opts    pointer to a string that describes the preprocessor
- *                      build options to be used for building the program
- * @return a cl_program object
- */
-cl_program av_opencl_compile(const char *program_name, const char* build_opts);
-
-/**
- * get OpenCL command queue
- *
- * @return a cl_command_queue object
- */
-cl_command_queue av_opencl_get_command_queue(void);
-
-/**
- * Create OpenCL buffer.
- *
- * The buffer is used to save the data used or created by an OpenCL
- * kernel.
- * The created buffer must be released with av_opencl_buffer_release().
- *
- * See clCreateBuffer() function reference for more information about
- * the parameters.
- *
- * @param cl_buf       pointer to OpenCL buffer
- * @param cl_buf_size  size in bytes of the OpenCL buffer to create
- * @param flags        flags used to control buffer attributes
- * @param host_ptr     host pointer of the OpenCL buffer
- * @return >=0 on success, a negative error code in case of failure
- */
-int av_opencl_buffer_create(cl_mem *cl_buf, size_t cl_buf_size, int flags, void *host_ptr);
-
-/**
- * Write OpenCL buffer with data from src_buf.
- *
- * @param dst_cl_buf        pointer to OpenCL destination buffer
- * @param src_buf           pointer to source buffer
- * @param buf_size          size in bytes of the source and destination buffers
- * @return >=0 on success, a negative error code in case of failure
- */
-int av_opencl_buffer_write(cl_mem dst_cl_buf, uint8_t *src_buf, size_t buf_size);
-
-/**
- * Read data from OpenCL buffer to memory buffer.
- *
- * @param dst_buf           pointer to destination buffer (CPU memory)
- * @param src_cl_buf        pointer to source OpenCL buffer
- * @param buf_size          size in bytes of the source and destination buffers
- * @return >=0 on success, a negative error code in case of failure
- */
-int av_opencl_buffer_read(uint8_t *dst_buf, cl_mem src_cl_buf, size_t buf_size);
-
-/**
- * Write image data from memory to OpenCL buffer.
- *
- * The source must be an array of pointers to image plane buffers.
- *
- * @param dst_cl_buf         pointer to destination OpenCL buffer
- * @param dst_cl_buf_size    size in bytes of OpenCL buffer
- * @param dst_cl_buf_offset  the offset of the OpenCL buffer start position
- * @param src_data           array of pointers to source plane buffers
- * @param src_plane_sizes    array of sizes in bytes of the source plane buffers
- * @param src_plane_num      number of source image planes
- * @return >=0 on success, a negative error code in case of failure
- */
-int av_opencl_buffer_write_image(cl_mem dst_cl_buf, size_t cl_buffer_size, int dst_cl_offset,
-                                 uint8_t **src_data, int *plane_size, int plane_num);
-
-/**
- * Read image data from OpenCL buffer.
- *
- * @param dst_data           array of pointers to destination plane buffers
- * @param dst_plane_sizes    array of pointers to destination plane buffers
- * @param dst_plane_num      number of destination image planes
- * @param src_cl_buf         pointer to source OpenCL buffer
- * @param src_cl_buf_size    size in bytes of OpenCL buffer
- * @return >=0 on success, a negative error code in case of failure
- */
-int av_opencl_buffer_read_image(uint8_t **dst_data, int *plane_size, int plane_num,
-                                cl_mem src_cl_buf, size_t cl_buffer_size);
-
-/**
- * Release OpenCL buffer.
- *
- * @param cl_buf pointer to OpenCL buffer to release, which was
- *               previously filled with av_opencl_buffer_create()
- */
-void av_opencl_buffer_release(cl_mem *cl_buf);
-
-/**
- * Release OpenCL environment.
- *
- * The OpenCL environment is effectively released only if all the created
- * kernels had been released with av_opencl_release_kernel().
- */
-void av_opencl_uninit(void);
-
-/**
- * Benchmark an OpenCL device with a user defined callback function.  This function
- * sets up an external OpenCL environment including context and command queue on
- * the device then tears it down in the end.  The callback function should perform
- * the rest of the work.
- *
- * @param device            pointer to the OpenCL device to be used
- * @param platform          cl_platform_id handle to which the device belongs to
- * @param benchmark         callback function to perform the benchmark, return a
- *                          negative value in case of failure
- * @return the score passed from the callback function, a negative error code in case
- * of failure
- */
-int64_t av_opencl_benchmark(AVOpenCLDeviceNode *device, cl_platform_id platform,
-                            int64_t (*benchmark)(AVOpenCLExternalEnv *ext_opencl_env));
-
-#endif /* AVUTIL_OPENCL_H */
diff --git a/libavutil/opencl_internal.c b/libavutil/opencl_internal.c
deleted file mode 100644
index bdb41936fa..0000000000
--- a/libavutil/opencl_internal.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2012 Peng Gao <peng@multicorewareinc.com>
- * Copyright (C) 2012 Li   Cao <li@multicorewareinc.com>
- * Copyright (C) 2012 Wei  Gao <weigao@multicorewareinc.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "opencl_internal.h"
-#include "libavutil/log.h"
-
-int avpriv_opencl_set_parameter(FFOpenclParam *opencl_param, ...)
-{
-    int ret = 0;
-    va_list arg_ptr;
-    void *param;
-    size_t param_size;
-    cl_int status;
-    if (!opencl_param->kernel) {
-        av_log(opencl_param->ctx, AV_LOG_ERROR, "OpenCL kernel must be set\n");
-        return AVERROR(EINVAL);
-    }
-    va_start(arg_ptr, opencl_param);
-    do {
-        param = va_arg(arg_ptr, void *);
-        if (!param)
-            break;
-        param_size = va_arg(arg_ptr, size_t);
-        if (!param_size) {
-            av_log(opencl_param->ctx, AV_LOG_ERROR, "Parameter size must not be 0\n");
-            ret = AVERROR(EINVAL);
-            goto end;
-        }
-        status = clSetKernelArg(opencl_param->kernel, opencl_param->param_num, param_size, param);
-        if (status != CL_SUCCESS) {
-            av_log(opencl_param->ctx, AV_LOG_ERROR, "Cannot set kernel argument: %s\n", av_opencl_errstr(status));
-            ret = AVERROR_EXTERNAL;
-            goto end;
-        }
-        opencl_param->param_num++;
-    } while (param && param_size);
-end:
-    va_end(arg_ptr);
-    return ret;
-}
diff --git a/libavutil/opencl_internal.h b/libavutil/opencl_internal.h
deleted file mode 100644
index 5cabb7b3ee..0000000000
--- a/libavutil/opencl_internal.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2012 Peng Gao <peng@multicorewareinc.com>
- * Copyright (C) 2012 Li   Cao <li@multicorewareinc.com>
- * Copyright (C) 2012 Wei  Gao <weigao@multicorewareinc.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_OPENCL_INTERNAL_H
-#define AVUTIL_OPENCL_INTERNAL_H
-
-#include "attributes.h"
-#include "opencl.h"
-
-#define FF_OPENCL_PARAM_INFO(a) ((void*)(&(a))), (sizeof(a))
-
-typedef struct {
-    cl_kernel kernel;
-    int param_num;
-    void *ctx;
-} FFOpenclParam;
-
-av_warn_unused_result
-int avpriv_opencl_set_parameter(FFOpenclParam *opencl_param, ...);
-
-#endif /* AVUTIL_OPENCL_INTERNAL_H */