From 296d70f58517d6702bfda32178c1e395bca9665e Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 1 May 2015 23:55:42 +0100
Subject: [PATCH] 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>
(cherry picked from commit 386e80610de282c92ad5897683ccaf2675766ac5)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
---
 libavformat/mux.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/mux.c b/libavformat/mux.c
index 8466605efb..e4b614467f 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -493,6 +493,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);