RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/vf_removelogo: use av_malloc_array() 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-05-14 06:17:27 +02:00
parent 14e2e40f3b
commit 6ab37221c8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/vf_removelogo.c
View File

@ -312,18 +312,18 @@ static av_cold int init(AVFilterContext *ctx)
the filter is applied, the mask size is determined on a pixel the filter is applied, the mask size is determined on a pixel
by pixel basis, with pixels nearer the edge of the logo getting by pixel basis, with pixels nearer the edge of the logo getting
smaller mask sizes. */ smaller mask sizes. */
mask = (int ***)av_malloc(sizeof(int **) * (s->max_mask_size + 1)); mask = (int ***)av_malloc_array(s->max_mask_size + 1, sizeof(int **));
if (!mask) if (!mask)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
for (a = 0; a <= s->max_mask_size; a++) { for (a = 0; a <= s->max_mask_size; a++) {
mask[a] = (int **)av_malloc(sizeof(int *) * ((a * 2) + 1)); mask[a] = (int **)av_malloc_array((a * 2) + 1, sizeof(int *));
if (!mask[a]) { if (!mask[a]) {
av_free(mask); av_free(mask);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
for (b = -a; b <= a; b++) { for (b = -a; b <= a; b++) {
mask[a][b + a] = (int *)av_malloc(sizeof(int) * ((a * 2) + 1)); mask[a][b + a] = (int *)av_malloc_array((a * 2) + 1, sizeof(int));
if (!mask[a][b + a]) { if (!mask[a][b + a]) {
av_free(mask); av_free(mask);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);