Commit 383a04a1 authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/mux: keep AVPacket fields consistent in ff_write_chained()

This might have caused double frees in theory, i do not have a test case
though
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent d44b8f0a
......@@ -963,6 +963,7 @@ int ff_write_chained(AVFormatContext *dst, int dst_stream, AVPacket *pkt,
AVFormatContext *src)
{
AVPacket local_pkt;
int ret;
local_pkt = *pkt;
local_pkt.stream_index = dst_stream;
......@@ -978,7 +979,11 @@ int ff_write_chained(AVFormatContext *dst, int dst_stream, AVPacket *pkt,
local_pkt.duration = av_rescale_q(pkt->duration,
src->streams[pkt->stream_index]->time_base,
dst->streams[dst_stream]->time_base);
return av_write_frame(dst, &local_pkt);
ret = av_write_frame(dst, &local_pkt);
pkt->buf = local_pkt.buf;
pkt->destruct = local_pkt.destruct;
return ret;
}
static int av_write_uncoded_frame_internal(AVFormatContext *s, int stream_index,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment