Skip to content
Snippets Groups Projects
Commit bb298967 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

avutil/opencl: use av_malloc(z)_array()

parent 52fca28c
No related branches found
No related tags found
No related merge requests found
...@@ -213,7 +213,7 @@ static int get_device_list(AVOpenCLDeviceList *device_list) ...@@ -213,7 +213,7 @@ static int get_device_list(AVOpenCLDeviceList *device_list)
"Could not get OpenCL platform ids: %s\n", av_opencl_errstr(status)); "Could not get OpenCL platform ids: %s\n", av_opencl_errstr(status));
return AVERROR_EXTERNAL; return AVERROR_EXTERNAL;
} }
platform_ids = av_mallocz(device_list->platform_num * sizeof(cl_platform_id)); platform_ids = av_mallocz_array(device_list->platform_num, sizeof(cl_platform_id));
if (!platform_ids) if (!platform_ids)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
status = clGetPlatformIDs(device_list->platform_num, platform_ids, NULL); status = clGetPlatformIDs(device_list->platform_num, platform_ids, NULL);
...@@ -223,7 +223,7 @@ static int get_device_list(AVOpenCLDeviceList *device_list) ...@@ -223,7 +223,7 @@ static int get_device_list(AVOpenCLDeviceList *device_list)
ret = AVERROR_EXTERNAL; ret = AVERROR_EXTERNAL;
goto end; goto end;
} }
device_list->platform_node = av_mallocz(device_list->platform_num * sizeof(AVOpenCLPlatformNode *)); device_list->platform_node = av_mallocz_array(device_list->platform_num, sizeof(AVOpenCLPlatformNode *));
if (!device_list->platform_node) { if (!device_list->platform_node) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto end; goto end;
...@@ -249,14 +249,14 @@ static int get_device_list(AVOpenCLDeviceList *device_list) ...@@ -249,14 +249,14 @@ static int get_device_list(AVOpenCLDeviceList *device_list)
device_type[j], 0, NULL, &devices_num[j]); device_type[j], 0, NULL, &devices_num[j]);
total_devices_num += devices_num[j]; total_devices_num += devices_num[j];
} }
device_list->platform_node[i]->device_node = av_mallocz(total_devices_num * sizeof(AVOpenCLDeviceNode *)); device_list->platform_node[i]->device_node = av_mallocz_array(total_devices_num, sizeof(AVOpenCLDeviceNode *));
if (!device_list->platform_node[i]->device_node) { if (!device_list->platform_node[i]->device_node) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto end; goto end;
} }
for (j = 0; j < FF_ARRAY_ELEMS(device_type); j++) { for (j = 0; j < FF_ARRAY_ELEMS(device_type); j++) {
if (devices_num[j]) { if (devices_num[j]) {
device_ids = av_mallocz(devices_num[j] * sizeof(cl_device_id)); device_ids = av_mallocz_array(devices_num[j], sizeof(cl_device_id));
if (!device_ids) { if (!device_ids) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto end; goto end;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment