From patchwork Fri Dec 2 23:52:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 1666 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp556193vsa; Fri, 2 Dec 2016 15:53:38 -0800 (PST) X-Received: by 10.194.171.200 with SMTP id aw8mr39324907wjc.79.1480722818704; Fri, 02 Dec 2016 15:53:38 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id wn4si7107631wjb.27.2016.12.02.15.53.37; Fri, 02 Dec 2016 15:53:38 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BBA29689FA7; Sat, 3 Dec 2016 01:53:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-2.mx.upcmail.net (vie01a-dmta-pe02-2.mx.upcmail.net [62.179.121.158]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 32D7B689F8A for ; Sat, 3 Dec 2016 01:52:55 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1cCxdX-0000NA-HK for ffmpeg-devel@ffmpeg.org; Sat, 03 Dec 2016 00:53:03 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id FBt21u00u0S5wYM01Bt3Tr; Sat, 03 Dec 2016 00:53:03 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 3 Dec 2016 00:52:57 +0100 Message-Id: <20161202235258.26223-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161202235258.26223-1-michael@niedermayer.cc> References: <20161202235258.26223-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 4/5] ffserver: remove one avcodec_context_copy() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Michael Niedermayer --- ffserver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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);