[FFmpeg-cvslog] avformat/mux: Dont leave stale side data pointers in ff_interleave_add_packet()

Michael Niedermayer git at videolan.org
Mon Jun 1 12:55:50 CEST 2015


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  2 14:48:22 2014 +0200| [3db9966152244540b69ae97c6304c2fec7c49aa6] | committer: Michael Niedermayer

avformat/mux: Dont leave stale side data pointers in ff_interleave_add_packet()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit bfb3ed1a9d5dafdc185080fdd88d02ff7221d30a)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3db9966152244540b69ae97c6304c2fec7c49aa6
---

 libavformat/mux.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/mux.c b/libavformat/mux.c
index eb39cbb..582c55b 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -657,6 +657,8 @@ FF_DISABLE_DEPRECATION_WARNINGS
 FF_ENABLE_DEPRECATION_WARNINGS
 #endif
     pkt->buf       = NULL;
+    pkt->side_data = NULL;
+    pkt->side_data_elems = 0;
     if ((pkt->flags & AV_PKT_FLAG_UNCODED_FRAME)) {
         av_assert0(pkt->size == UNCODED_FRAME_PACKET_SIZE);
         av_assert0(((AVFrame *)pkt->data)->buf);



More information about the ffmpeg-cvslog mailing list