From patchwork Mon Dec 26 20:35:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 1934 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1192273vsb; Mon, 26 Dec 2016 12:35:30 -0800 (PST) X-Received: by 10.194.209.169 with SMTP id mn9mr24445638wjc.114.1482784530523; Mon, 26 Dec 2016 12:35:30 -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 ju1si47274679wjc.128.2016.12.26.12.35.29; Mon, 26 Dec 2016 12:35:30 -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 DD126689B91; Mon, 26 Dec 2016 22:35:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-1.mx.upcmail.net (vie01a-qmta-pe01-1.mx.upcmail.net [62.179.121.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 75E90689AB8 for ; Mon, 26 Dec 2016 22:35:18 +0200 (EET) Received: from [172.31.218.35] (helo=vie01a-dmta-pe02-2.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1cLbzM-0002oc-Cd for ffmpeg-devel@ffmpeg.org; Mon, 26 Dec 2016 21:35:20 +0100 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 1cLbzG-0004iw-Dm for ffmpeg-devel@ffmpeg.org; Mon, 26 Dec 2016 21:35:14 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id QkbD1u00E0S5wYM01kbEkK; Mon, 26 Dec 2016 21:35:14 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 26 Dec 2016 21:35:12 +0100 Message-Id: <20161226203512.12406-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] ffmpeg: Remove deadcode 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" Fixes: CID1396243 Signed-off-by: Michael Niedermayer --- ffmpeg.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index ec9da3e6e2..b85c31459c 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1797,7 +1797,6 @@ static void flush_encoders(void) OutputStream *ost = output_streams[i]; AVCodecContext *enc = ost->enc_ctx; OutputFile *of = output_files[ost->file_index]; - int stop_encoding = 0; if (!ost->encoding_needed) continue; @@ -1816,6 +1815,8 @@ static void flush_encoders(void) for (;;) { const char *desc = NULL; + AVPacket pkt; + int pkt_size; switch (enc->codec_type) { case AVMEDIA_TYPE_AUDIO: @@ -1828,9 +1829,6 @@ static void flush_encoders(void) av_assert0(0); } - if (1) { - AVPacket pkt; - int pkt_size; av_init_packet(&pkt); pkt.data = NULL; pkt.size = 0; @@ -1848,7 +1846,6 @@ static void flush_encoders(void) fprintf(ost->logfile, "%s", enc->stats_out); } if (ret == AVERROR_EOF) { - stop_encoding = 1; break; } if (ost->finished & MUXER_FINISHED) { @@ -1861,10 +1858,6 @@ static void flush_encoders(void) if (ost->enc_ctx->codec_type == AVMEDIA_TYPE_VIDEO && vstats_filename) { do_video_stats(ost, pkt_size); } - } - - if (stop_encoding) - break; } } }