lavf/tee: fix side data double free.
authorNicolas George <george@nsup.org>
Sat, 10 Oct 2015 13:19:43 +0000 (15:19 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 13 Dec 2015 09:14:24 +0000 (10:14 +0100)
Similar to 33fefdb44.
Fix trac ticket #4921.

Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 1acc90eaa54ad82a21474ed759b8ed3a0f3d482d)

Conflicts:

libavformat/tee.c

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/tee.c

index bc2e522..a916841 100644 (file)
@@ -409,6 +409,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
         }
 
         if (ret > 0) {
+            pkt->side_data = NULL;
+            pkt->side_data_elems = 0;
             av_free_packet(pkt);
             new_pkt.buf = av_buffer_create(new_pkt.data, new_pkt.size,
                                            av_buffer_default_free, NULL, 0);