aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-19 17:45:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-03-07 04:04:07 +0100
commit8b0880ff1b532831d44441df595e75bdb20a6329 (patch)
treef8bc99a19532ad5ffa0bb757b7d1a7a94f846ee1
parentf1f06710c4378029935d155ecd08fa3f38d6fece (diff)
downloadffmpeg-8b0880ff1b532831d44441df595e75bdb20a6329.tar.gz
avcodec/avpacket/av_packet_split_side_data: ensure that side data padding is initialized
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 240fd8c96f59ebe9dcfc4152a1086cd3f63400c0) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1e48318802b3caa493a40c0584afc30cc866d9d0) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/avpacket.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
index 516f1c972b..c8724de346 100644
--- a/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@ -283,7 +283,7 @@ int av_packet_split_side_data(AVPacket *pkt){
for (i=0; ; i++){
size= AV_RB32(p);
av_assert0(size<=INT_MAX && p - pkt->data >= size);
- pkt->side_data[i].data = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
+ pkt->side_data[i].data = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
pkt->side_data[i].size = size;
pkt->side_data[i].type = p[4]&127;
if (!pkt->side_data[i].data)