From patchwork Sun Nov 18 16:43:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 11070 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id BD0BD44E155 for ; Sun, 18 Nov 2018 18:43:44 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4974E689D22; Sun, 18 Nov 2018 18:43:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 88D28689CF2 for ; Sun, 18 Nov 2018 18:43:38 +0200 (EET) Received: by mail-pl1-f171.google.com with SMTP id a14so8806480plm.12 for ; Sun, 18 Nov 2018 08:43:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uaNpAzE3/AyR0L9WkDgvoVNNGV44mnK/AXLLha3muRE=; b=odpH0IWWZauMNwESJWf62JwecCgZdBiLzIot1jiHs3qYdd3/jpjQICSPx4LXFn6aU8 5zkgwPB9PaDyrsMxRUeKgzGRN7hPNAsVhjITrE2fmSEvVNlSS9R9pZreY00ZCHDyQX26 VVmbKaRLV+HmiJhNf2MN3b8nPr4cv6hZpKR2QNsK+j0F4gg3Eofbwt97TsGdCmqaaYbW Gd6HrSgi6w9LeM0FeO4VTxYUxt86xR60874iYtlGrgfyA+jdPMy+HX0v5kSk/lFm5agv 8LEUheL3IslgqF3FCscQYKEOLTbsLZrqAJu5kYifvuyd5oPsdMgCOSq/Ps+C2FoNqsZe 9eBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uaNpAzE3/AyR0L9WkDgvoVNNGV44mnK/AXLLha3muRE=; b=pVgomJPBYxmtpzmK1Ri6cOdwGEORkx1euPseBVF8CP06uTs5LyHYhvPPa6LsVJIunv WDvGRsCb5bxIGB8YtVGbPSyx/FmiVibMt2DcN49UMJhjeSmstu4E6yd4Pg5Di4nHPbWU 2OyH9AbRdAj9RSmyGmJxROY8y/wQ9dRnPFsMNhXO+IpBxiAdpbAUvAg3QRtVzD03qsEm sxM2GFkgzjYk50xvAbIEVdRIsd1YnodVg4dbb5UCWphp7Y3gAgDZ1ZZhYD7eKRcS4Mu4 CHcfi0FsobccsbE/MZ4bgjMfQLDky7p8AquzOKHzZIGeETUs+EBUg7meBtxX55oSWKHS 52qA== X-Gm-Message-State: AGRZ1gK9epPZyRW3faapqgb/Fw7/ffq25uR2bseq5N6nR5sQXCmMmKP8 PZbWKm3TLREZsqY2Y/CNv7nAPvbU X-Google-Smtp-Source: AJdET5eMZhrtZ6Ah4HHbuOMYE9gApBXUEPdWoibu0P8s2R+AwbaemasUmtvvA1nP6ZViwLwdvEQrnQ== X-Received: by 2002:a17:902:104:: with SMTP id 4-v6mr19425562plb.184.1542559418055; Sun, 18 Nov 2018 08:43:38 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id 79sm36915215pge.66.2018.11.18.08.43.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Nov 2018 08:43:37 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Nov 2018 00:43:13 +0800 Message-Id: <1542559394-3305-5-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1542559394-3305-1-git-send-email-mypopydev@gmail.com> References: <1542559394-3305-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/5] fftools/ffmpeg: delete the unused code. 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" There are come from 2012 ago and have never been used from this time. Signed-off-by: Jun Zhao --- fftools/ffmpeg.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index a12208c..085d6d2 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1485,8 +1485,6 @@ static int reap_filters(int flush) av_rescale_q(filtered_frame->pts, filter_tb, enc->time_base) - av_rescale_q(start_time, AV_TIME_BASE_Q, enc->time_base); } - //if (ost->source_index >= 0) - // *filtered_frame= *input_streams[ost->source_index]->decoded_frame; //for me_threshold switch (av_buffersink_get_type(filter)) { case AVMEDIA_TYPE_VIDEO: @@ -3340,7 +3338,7 @@ static int init_output_stream_encode(OutputStream *ost) "if you want a different framerate.\n", ost->file_index, ost->index); } -// ost->frame_rate = ist->st->avg_frame_rate.num ? ist->st->avg_frame_rate : (AVRational){25, 1}; + if (ost->enc->supported_framerates && !ost->force_fps) { int idx = av_find_nearest_q_idx(ost->frame_rate, ost->enc->supported_framerates); ost->frame_rate = ost->enc->supported_framerates[idx]; @@ -4879,11 +4877,6 @@ int main(int argc, char **argv) exit_program(1); } -// if (nb_input_files == 0) { -// av_log(NULL, AV_LOG_FATAL, "At least one input file must be specified\n"); -// exit_program(1); -// } - for (i = 0; i < nb_output_files; i++) { if (strcmp(output_files[i]->ctx->oformat->name, "rtp")) want_sdp = 0;