diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 17:29:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 17:29:59 +0200 |
| commit | 909dbb07ebeb230d7603c8e431e0445c254cc6d0 (patch) | |
| tree | 65083eaf7faa4f60eff4841adf57e0ff9b6a87a3 | |
| parent | 758f929d212dd9feb7d40833e96c22018e4d4412 (diff) | |
| download | ffmpeg-909dbb07ebeb230d7603c8e431e0445c254cc6d0.tar.gz | |
ffmpeg_opt: fix ffserver with the 2 encoder contexts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | ffmpeg_opt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index d90edc1fbb..aabcfc0446 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -1632,6 +1632,7 @@ static int read_ffserver_streams(OptionsContext *o, AVFormatContext *s, const ch choose_sample_fmt(st, codec); 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); } avformat_close_input(&ic); |