[FFmpeg-cvslog] ffmpeg_opt: fix ffserver with the 2 encoder contexts

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun  1 17:29:59 2014 +0200| [909dbb07ebeb230d7603c8e431e0445c254cc6d0] | committer: Michael Niedermayer

ffmpeg_opt: fix ffserver with the 2 encoder contexts

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=909dbb07ebeb230d7603c8e431e0445c254cc6d0
---

 ffmpeg_opt.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index d90edc1..aabcfc0 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);