ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@gmx.at> | Fri May 1 23:55:42 2015 +0100| [296d70f58517d6702bfda32178c1e395bca9665e] | committer: Reinhard Tartler
mux: Do not leave stale side data pointers in ff_interleave_add_packet() Signed-off-by: Michael Niedermayer <michae...@gmx.at> Signed-off-by: Vittorio Giovara <vittorio.giov...@gmail.com> (cherry picked from commit 386e80610de282c92ad5897683ccaf2675766ac5) Signed-off-by: Reinhard Tartler <siret...@tauware.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=296d70f58517d6702bfda32178c1e395bca9665e --- libavformat/mux.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/mux.c b/libavformat/mux.c index 8466605..e4b6144 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); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
