[SCM] libav/experimental: Use av_mallocz instead of explicitly zeroing in url_open_dyn_buf_internal.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:35:26 UTC 2013


The following commit has been merged in the experimental branch:
commit dc2c2eea41200d317952b856b1f7c79e9da24475
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Fri Jan 16 15:32:33 2009 +0000

    Use av_mallocz instead of explicitly zeroing in url_open_dyn_buf_internal.
    
    Originally committed as revision 16634 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 15328d3..34a55d5 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -794,7 +794,7 @@ static int url_open_dyn_buf_internal(ByteIOContext **s, int max_packet_size)
 
     if(sizeof(DynBuffer) + io_buffer_size < io_buffer_size)
         return -1;
-    d = av_malloc(sizeof(DynBuffer) + io_buffer_size);
+    d = av_mallocz(sizeof(DynBuffer) + io_buffer_size);
     if (!d)
         return -1;
     *s = av_mallocz(sizeof(ByteIOContext));
@@ -803,10 +803,6 @@ static int url_open_dyn_buf_internal(ByteIOContext **s, int max_packet_size)
         return AVERROR(ENOMEM);
     }
     d->io_buffer_size = io_buffer_size;
-    d->buffer = NULL;
-    d->pos = 0;
-    d->size = 0;
-    d->allocated_size = 0;
     ret = init_put_byte(*s, d->io_buffer, io_buffer_size,
                         1, d, NULL,
                         max_packet_size ? dyn_packet_buf_write : dyn_buf_write,

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list