highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/unsharp_opencl: use av_mallocz_array()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-07-06 14:33:54 +02:00
parent a53c5d454e
commit 11e4890eeb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/unsharp_opencl.c
View File

@ -54,7 +54,7 @@ static int compute_mask(int step, uint32_t *mask)
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto end; goto end;
} }
counter = av_mallocz(sizeof(uint32_t *) * (2 * step + 1)); counter = av_mallocz_array(2 * step + 1, sizeof(uint32_t *));
if (!counter) { if (!counter) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto end; goto end;
@ -92,12 +92,12 @@ static int compute_mask_matrix(cl_mem cl_mask_matrix, int step_x, int step_y)
int i, j, ret = 0; int i, j, ret = 0;
uint32_t *mask_matrix, *mask_x, *mask_y; uint32_t *mask_matrix, *mask_x, *mask_y;
size_t size_matrix = sizeof(uint32_t) * (2 * step_x + 1) * (2 * step_y + 1); size_t size_matrix = sizeof(uint32_t) * (2 * step_x + 1) * (2 * step_y + 1);
mask_x = av_mallocz(sizeof(uint32_t) * (2 * step_x + 1)); mask_x = av_mallocz_array(2 * step_x + 1, sizeof(uint32_t));
if (!mask_x) { if (!mask_x) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto end; goto end;
} }
mask_y = av_mallocz(sizeof(uint32_t) * (2 * step_y + 1)); mask_y = av_mallocz_array(2 * step_y + 1, sizeof(uint32_t));
if (!mask_y) { if (!mask_y) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto end; goto end;