From patchwork Sun Nov 27 18:06:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 1574 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1416124vsb; Sun, 27 Nov 2016 10:06:48 -0800 (PST) X-Received: by 10.194.57.180 with SMTP id j20mr15490979wjq.165.1480270007918; Sun, 27 Nov 2016 10:06:47 -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 w9si51360414wjq.15.2016.11.27.10.06.47; Sun, 27 Nov 2016 10:06:47 -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 3BC17689DD1; Sun, 27 Nov 2016 20:06:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-1.mx.upcmail.net (vie01a-dmta-pe04-1.mx.upcmail.net [62.179.121.163]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C3FA689D89 for ; Sun, 27 Nov 2016 20:06:19 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1cB3qK-0002o4-Oj for ffmpeg-devel@ffmpeg.org; Sun, 27 Nov 2016 19:06:24 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id D66P1u01H0S5wYM0166Qn9; Sun, 27 Nov 2016 19:06:24 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 27 Nov 2016 19:06:20 +0100 Message-Id: <20161127180620.18419-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161127180620.18419-1-michael@niedermayer.cc> References: <20161127180620.18419-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/3] ffserver: Remove some deprecated API use related to codec/codecpar 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 Cc: Reynaldo Verdejo MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Michael Niedermayer --- ffserver.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/ffserver.c b/ffserver.c index 1d8abd9..ded5149 100644 --- a/ffserver.c +++ b/ffserver.c @@ -2288,8 +2288,6 @@ static int http_prepare_data(HTTPContext *c) unlayer_stream(c->pfmt_ctx->streams[i], src); //TODO we no longer copy st->internal, does this matter? av_assert0(!c->pfmt_ctx->streams[i]->priv_data); - /* XXX: should be done in AVStream, not in codec */ - c->pfmt_ctx->streams[i]->codec->frame_number = 0; } /* set output format parameters */ c->pfmt_ctx->oformat = c->stream->fmt; @@ -2387,7 +2385,7 @@ static int http_prepare_data(HTTPContext *c) AVStream *st = c->fmt_in->streams[source_index]; pkt.stream_index = i; if (pkt.flags & AV_PKT_FLAG_KEY && - (st->codec->codec_type == AVMEDIA_TYPE_VIDEO || + (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO || c->stream->nb_streams == 1)) c->got_key_frame = 1; if (!c->stream->send_on_key || c->got_key_frame) @@ -2395,7 +2393,6 @@ static int http_prepare_data(HTTPContext *c) } } } else { - AVCodecContext *codec; AVStream *ist, *ost; send_it: ist = c->fmt_in->streams[source_index]; @@ -2416,13 +2413,11 @@ static int http_prepare_data(HTTPContext *c) av_packet_unref(&pkt); break; } - codec = ctx->streams[0]->codec; /* only one stream per RTP connection */ pkt.stream_index = 0; } else { ctx = c->pfmt_ctx; /* Fudge here */ - codec = ctx->streams[pkt.stream_index]->codec; } if (c->is_packetized) { @@ -2464,7 +2459,6 @@ static int http_prepare_data(HTTPContext *c) c->buffer_ptr = c->pb_buffer; c->buffer_end = c->pb_buffer + len; - codec->frame_number++; if (len == 0) { av_packet_unref(&pkt); goto redo;