[FFmpeg-cvslog] avfilter/vf_removelogo: use av_malloc_array()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 14 06:17:27 2014 +0200| [6ab37221c8eeb9736b6bad046322bec19536b3ee] | committer: Michael Niedermayer

avfilter/vf_removelogo: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6ab37221c8eeb9736b6bad046322bec19536b3ee
---

 libavfilter/vf_removelogo.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavfilter/vf_removelogo.c b/libavfilter/vf_removelogo.c
index 889050b..555517f 100644
--- a/libavfilter/vf_removelogo.c
+++ b/libavfilter/vf_removelogo.c
@@ -312,18 +312,18 @@ static av_cold int init(AVFilterContext *ctx)
        the filter is applied, the mask size is determined on a pixel
        by pixel basis, with pixels nearer the edge of the logo getting
        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)
         return AVERROR(ENOMEM);
 
     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]) {
             av_free(mask);
             return AVERROR(ENOMEM);
         }
         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]) {
                 av_free(mask);
                 return AVERROR(ENOMEM);