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-19 12:14:18 +0100
commit386e80610de282c92ad5897683ccaf2675766ac5 (patch)
tree569954967d917f9e35ff8fe48e3b508811468eec
parent744d813bcf527481f2217428fa08bfee8642935b (diff)
downloadffmpeg-386e80610de282c92ad5897683ccaf2675766ac5.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 df4f57a7f3..d4492d129f 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -400,6 +400,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);