From patchwork Sat Nov 24 03:31:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 11143 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 95E6C44D76B for ; Sat, 24 Nov 2018 05:31:37 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2482368A2AA; Sat, 24 Nov 2018 05:31:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D990568A1CC for ; Sat, 24 Nov 2018 05:31:30 +0200 (EET) Received: by mail-pf1-f195.google.com with SMTP id h3so4078288pfg.1 for ; Fri, 23 Nov 2018 19:31:34 -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=Rc9x4N0nkb5R0sn0NEfTMVzNejwyHMtlDZO6NBNLmW71ucBYBB6NKUEHw6SfXGPxwx pXcp+lwCOQotKjV2BdOwuO2sC9/CmRIlBRslRmxYpy9FzXuF+SHcz/TRZViyEN6b88us Ld3JVv1CCouHm9zOMYtIwf9lVX4d3h6YBPWGAmudoDmNSpK/2+h4bBVZ5dVkXebLoQcJ rQi6KgMPTrXWraBy3KvIQ/xQBhU492UR8RY4KFyyAdVP2mImsu3PifrGyzGueUjQw/A/ fNhG2g1wxvXMXvv7mNI0+tPju/3isQWKF+8VR1kzknVxTWMKGai0XlzViyOFddxd45nD h44w== 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=drJ0DMly8WoGkbvNTVnxwcTDmqHEZbyygRcdVTdQIdL8WnsafgsZCOKtCeYcRC/MxJ b7plCETTQ9xU8a5koxdp2yeDSaxrH5zXApi9+x/hjAhwsEzDGcBI3GTg5oI+syAVzo/R ycxRTKOEaAt/APV3kuIpzLgb6rxabqHkXA8GW6YcC23erH8gF7ipFOHq88wx2Rppcznb p9QIAjHGfUevgRdaXsdM5D66WHmWWpI+ShmWCqCOzy07d3v0CC+CG6JjMiTxxkj8Fm5s CgwObiAWw3sl6aP50Ucr1z2rflgiK+RhsM+GftfveUIMlEgtQIeJ0voFD3X8Gc91WGb0 3hbA== X-Gm-Message-State: AA+aEWZflP8nzrMaS+PBMjij+qO8hAsaTx7Zdbgm4vAfr/Xq6pqf4Mx3 crGvAU2glB7McywoyoLYXfG+tQLt X-Google-Smtp-Source: AFSGD/WGrJ9b4k48vd0QQ51Ln6hKTsAhVXDi6XqfC7slVvSk34LyhI3iZHFvVyvhZf2twPou7oX+Sg== X-Received: by 2002:a63:c10f:: with SMTP id w15mr16417989pgf.199.1543030292740; Fri, 23 Nov 2018 19:31:32 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id z62sm40357912pfl.33.2018.11.23.19.31.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Nov 2018 19:31:32 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Nov 2018 11:31:14 +0800 Message-Id: <1543030277-11374-4-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1543030277-11374-1-git-send-email-mypopydev@gmail.com> References: <1543030277-11374-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V4 3/6] 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;