summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJun Zhao <mypopydev@gmail.com>2018-06-20 11:13:59 +0800
committerJun Zhao <jun.zhao@intel.com>2018-06-29 05:23:20 +0800
commite6ac328b79f42be2c92e8abec458e4b3a32c44f9 (patch)
tree238f8d0b6f1e491af674030b8aff48103d79241f
parent2730a0fdf47c6ecbb6029d2b0dc47a27b377bcee (diff)
downloadffmpeg-streaming-e6ac328b79f42be2c92e8abec458e4b3a32c44f9.zip
ffmpeg-streaming-e6ac328b79f42be2c92e8abec458e4b3a32c44f9.tar.gz
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@gmail.com>
-rw-r--r--libavutil/hwcontext_opencl.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c
index 06448c6..ad82ef6 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,
OpenPOWER on IntegriCloud