aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhighgod0401 <highgod0401@gmail.com>2013-04-04 20:20:47 +0800
committerMichael Niedermayer <michaelni@gmx.at>2013-04-04 19:27:45 +0200
commitcfaffb1ab7de383e8fe67add8ff42f0a2c52ff97 (patch)
treecd2db8e2fb1292e51a496b38da56dc89a3dcb564
parent322428c851980396485d4c6bb4cfe79db43467f8 (diff)
downloadffmpeg-cfaffb1ab7de383e8fe67add8ff42f0a2c52ff97.tar.gz
avutil/opencl: replace assert by check and error message in av_opencl_init()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavutil/opencl.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libavutil/opencl.c b/libavutil/opencl.c
index 0bf7a8294d..c6d555c3a5 100644
--- a/libavutil/opencl.c
+++ b/libavutil/opencl.c
@@ -554,7 +554,12 @@ int av_opencl_init(AVDictionary *options, AVOpenCLExternalEnv *ext_opencl_env)
ret = compile_kernel_file(&gpu_env, NULL);
if (ret < 0)
goto end;
- av_assert1(gpu_env.kernel_code_count > 0);
+ if (gpu_env.kernel_code_count <= 0) {
+ av_log(&openclutils, AV_LOG_ERROR,
+ "No kernel code is registered, compile kernel file failed\n");
+ ret = AVERROR(EINVAL);
+ goto end;
+ }
gpu_env.init_count++;
end: