[FFmpeg-cvslog] hwcontext_opencl: Remove the opencl_device_init in opencl_device_derive
Jun Zhao
git at videolan.org
Fri Jun 29 00:37:19 EEST 2018
ffmpeg | branch: master | Jun Zhao <mypopydev at gmail.com> | Wed Jun 20 11:13:59 2018 +0800| [e6ac328b79f42be2c92e8abec458e4b3a32c44f9] | committer: Jun Zhao
hwcontext_opencl: Remove the opencl_device_init in opencl_device_derive
In opencl device derived case, don't need to call opencl_device_init.
Signed-off-by: Jun Zhao <mypopydev at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e6ac328b79f42be2c92e8abec458e4b3a32c44f9
---
libavutil/hwcontext_opencl.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c
index 06448c657d..ad82ef6b2d 100644
--- a/libavutil/hwcontext_opencl.c
+++ b/libavutil/hwcontext_opencl.c
@@ -1361,10 +1361,7 @@ static int opencl_device_derive(AVHWDeviceContext *hwdev,
break;
}
- if (err < 0)
- return err;
-
- return opencl_device_init(hwdev);
+ return err;
}
static int opencl_get_plane_format(enum AVPixelFormat pixfmt,
More information about the ffmpeg-cvslog
mailing list