ffmpeg | branch: master | Mark Thompson <s...@jkqxz.net> | Wed Nov 28 00:16:30 2018 +0000| [21608bc30303b221db8f3e2fb0952e7e7f2bd270] | committer: Mark Thompson
hwcontext_opencl: Use correct function to enumerate devices Also assert that all required functions are present. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21608bc30303b221db8f3e2fb0952e7e7f2bd270 --- libavutil/hwcontext_opencl.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c index be71c8323e..d3df6221c4 100644 --- a/libavutil/hwcontext_opencl.c +++ b/libavutil/hwcontext_opencl.c @@ -500,6 +500,9 @@ static int opencl_device_create_internal(AVHWDeviceContext *hwdev, *device_name_src = NULL; int err, found, p, d; + av_assert0(selector->enumerate_platforms && + selector->enumerate_devices); + err = selector->enumerate_platforms(hwdev, &nb_platforms, &platforms, selector->context); if (err) @@ -531,9 +534,9 @@ static int opencl_device_create_internal(AVHWDeviceContext *hwdev, continue; } - err = opencl_enumerate_devices(hwdev, platforms[p], platform_name, - &nb_devices, &devices, - selector->context); + err = selector->enumerate_devices(hwdev, platforms[p], platform_name, + &nb_devices, &devices, + selector->context); if (err < 0) continue; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog