aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-01 23:55:42 +0100
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-05-06 15:01:35 +0100
commite0010bb91fc0b067be8aefd2f77e6838537da433 (patch)
tree53e100c36fc76ba6e1bdddffc5d0b518ef0f5870
parent6c8c7c246280cdcd23e4d99006b95245ae837278 (diff)
downloadffmpeg-e0010bb91fc0b067be8aefd2f77e6838537da433.tar.gz
mux: Do not leave stale side data pointers in ff_interleave_add_packet()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
-rw-r--r--libavformat/mux.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c
index 503241ff61..25d69d5ef4 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -419,6 +419,8 @@ FF_DISABLE_DEPRECATION_WARNINGS
FF_ENABLE_DEPRECATION_WARNINGS
#endif
pkt->buf = NULL;
+ pkt->side_data = NULL;
+ pkt->side_data_elems = 0;
// Duplicate the packet if it uses non-allocated memory
if ((ret = av_dup_packet(&this_pktl->pkt)) < 0) {
av_free(this_pktl);