Browse Source

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: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.5
Lukasz Marek Michael Niedermayer 11 years ago
parent
commit
2b14593148
1 changed files with 4 additions and 0 deletions
  1. +4
    -0
      ffmpeg_opt.c

+ 4
- 0
ffmpeg_opt.c View File

@@ -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)
choose_pixel_fmt(st, st->codec, codec, st->codec->pix_fmt);
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);


Loading…
Cancel
Save