Commit 2b145931 authored by Lukasz Marek's avatar Lukasz Marek Committed by Michael Niedermayer

ffmpeg_opt: free incorrect priv_data for feed stream

new_output_stream creates a codec context with arbitraty picked codec.
Later data is updated, but priv_data are left alone.
There is a bit chance there is a mismatch between codecs.
Signed-off-by: 's avatarLukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 33301f00
...@@ -1649,6 +1649,10 @@ static int read_ffserver_streams(OptionsContext *o, AVFormatContext *s, const ch ...@@ -1649,6 +1649,10 @@ static int read_ffserver_streams(OptionsContext *o, AVFormatContext *s, const ch
else if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && !ost->stream_copy) else if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && !ost->stream_copy)
choose_pixel_fmt(st, st->codec, codec, st->codec->pix_fmt); choose_pixel_fmt(st, st->codec, codec, st->codec->pix_fmt);
avcodec_copy_context(ost->enc_ctx, st->codec); avcodec_copy_context(ost->enc_ctx, st->codec);
if (ost->enc_ctx->priv_data) {
av_opt_free(ost->enc_ctx->priv_data);
av_freep(&ost->enc_ctx->priv_data);
}
} }
avformat_close_input(&ic); avformat_close_input(&ic);
......
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