From: Michael Niedermayer <michael@niedermayer.cc>
Date: Fri, 2 Dec 2016 23:52:57 +0000 (+0100)
Subject: ffserver: remove one avcodec_context_copy()
X-Git-Tag: android-x86-7.1-r1~2827
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6c15618b90e4872e119fb083d31b6fc7661b33bb;p=android-x86%2Fexternal-ffmpeg.git

ffserver: remove one avcodec_context_copy()

Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---

diff --git a/ffserver.c b/ffserver.c
index 19c3ceda1a..3ff761f68f 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -2854,7 +2854,8 @@ static int http_receive_data(HTTPContext *c)
             for (i = 0; i < s->nb_streams; i++) {
                 LayeredAVStream *fst = feed->streams[i];
                 AVStream *st = s->streams[i];
-                avcodec_copy_context(fst->codec, st->codec);
+                avcodec_parameters_to_context(fst->codec, st->codecpar);
+                avcodec_parameters_from_context(fst->codecpar, fst->codec);
             }
 
             avformat_close_input(&s);