[FFmpeg-cvslog] avdevice/alsa-audio-common: Use *alloc_array()

Michael Niedermayer git at videolan.org
Tue Jan 20 17:06:35 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 20 16:24:21 2015 +0100| [48895a23fc0362a0e73e01af7ad5a761fd4aa86c] | committer: Michael Niedermayer

avdevice/alsa-audio-common: Use *alloc_array()

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

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

 libavdevice/alsa-audio-common.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavdevice/alsa-audio-common.c b/libavdevice/alsa-audio-common.c
index b7f5313..bf876ed 100644
--- a/libavdevice/alsa-audio-common.c
+++ b/libavdevice/alsa-audio-common.c
@@ -280,7 +280,7 @@ av_cold int ff_alsa_open(AVFormatContext *ctx, snd_pcm_stream_t mode,
         }
         if (s->reorder_func) {
             s->reorder_buf_size = buffer_size;
-            s->reorder_buf = av_malloc(s->reorder_buf_size * s->frame_size);
+            s->reorder_buf = av_malloc_array(s->reorder_buf_size, s->frame_size);
             if (!s->reorder_buf)
                 goto fail1;
         }
@@ -336,7 +336,7 @@ int ff_alsa_extend_reorder_buf(AlsaData *s, int min_size)
     av_assert0(size != 0);
     while (size < min_size)
         size *= 2;
-    r = av_realloc(s->reorder_buf, size * s->frame_size);
+    r = av_realloc_array(s->reorder_buf, size, s->frame_size);
     if (!r)
         return AVERROR(ENOMEM);
     s->reorder_buf = r;



More information about the ffmpeg-cvslog mailing list