diff options
author | Christophe Gisquet <christophe.gisquet@gmail.com> | 2014-08-13 18:40:17 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 03:43:17 +0200 |
commit | 33fefdb44992bce18acb4548f28c9cd5b31de11f (patch) | |
tree | e76261422d0185860bc0ccb8148cb7eaa2418d40 | |
parent | 6c1ee1a11446abbe662fc89b9dff0f0a3d5fdd55 (diff) | |
download | ffmpeg-33fefdb44992bce18acb4548f28c9cd5b31de11f.tar.gz |
ffmpeg: fix streamcopy with side data
The issue is that, when the main packet data buffer is changed, streamcopy
uses a temporary new packet to store that buffer, frees the old packet, and
replace it with the new packet.
However, in doing so, it forgets about the side data, which gets freed, but
is still needed and referenced. Then, when the packet gets freed again in
the normal code path, it attempts to free its side data which has already
been freed.
Therefore, simply avoid the first free on side data by removing that side
data from the packet.
Fixes ticket #3773.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | ffmpeg.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -627,6 +627,8 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost) a = AVERROR(ENOMEM); } if (a > 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); |