From patchwork Mon Nov 15 15:23:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 31432 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp5992517iob; Mon, 15 Nov 2021 07:25:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJwg1vcg7faeF83elWay0AHiOxDOfxw2xkce+w1H+3gYZJRkbM2lB86WjfK95kkQGgBQvAVy X-Received: by 2002:a05:6402:274f:: with SMTP id z15mr57992252edd.200.1636989954469; Mon, 15 Nov 2021 07:25:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636989954; cv=none; d=google.com; s=arc-20160816; b=H5aaNoHLLF/Teblax9uJScBQ5Iuie8R9Qtdw80QK1q2drBNA6SBFmK/SFtoBd3c/Ap Jl59n/YIb0EWSBBn48n8jyEpVFxBI8ONbPIrMHT8cksvZbtyUUisCFqGDqazD29z3iGO WWHpOe//ctiVwasVmqb0hjoLQY1vAJVospP+LvMAYiPg69VEaDxAa7Ycm87wZ/X/Fq0E ZaLCM+jdyuVCxSt0vUaSYAvmNUc9bHrjCBDyyJA/lhMGV4Zw1XNWGUkj66m0RSfweoEq ElczWHhIvLBqPxia1m6k+LIJIRqbEVuFMPhwxjEyC1qGbrV/mvqG9WX9ZcMAP78ZjCn0 Qp6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=dFeP/j+N+iIzN5T/RdVimy/zng5X2XSz5EV3JLvgQuM=; b=lY/i3IL62J3T5EDMpqPAfr7RKsN+ePF2u5xR11Hefm78hHMy2Cnsu4gu70uzPqDqHP NDb+KUai6Ht452ZPcNb+gu7RLmyqJIl3Zug5IyrGU5wrXKLZI+6Wr9LHRacIsB4i2D4s LFlZric5Ybdu3aUZZYbU4iVMWfKXczsc8Ag8YOeukTJSjm2LFDp5qGKfxelBqueZrgLd icjnOiqaFHvvj2EeTYqmqE4ELSckL/jBKiZ6pUezoa9FIiIxSQvMF90BiLDWJYlbMWIp HNIa//vs2U4sz+WucUIX5aahZSSsdIT8OtVSZh4AUndPqEJMbphUp0Q8n3SjpVSDxpOG cYkw== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fz1si11627597ejc.502.2021.11.15.07.25.53; Mon, 15 Nov 2021 07:25:54 -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 2BF4168AE8E; Mon, 15 Nov 2021 17:24:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A83AB68AE77 for ; Mon, 15 Nov 2021 17:24:15 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 23344240506 for ; Mon, 15 Nov 2021 16:24:14 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id yzpimOfhlkUo for ; Mon, 15 Nov 2021 16:24:08 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 81AF7240175 for ; Mon, 15 Nov 2021 16:24:07 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 6C9053A073E; Mon, 15 Nov 2021 16:24:07 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Nov 2021 16:23:54 +0100 Message-Id: <20211115152400.5522-3-anton@khirnov.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211115152400.5522-1-anton@khirnov.net> References: <20211115152400.5522-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/9] ffmpeg: drop the -deinterlace option X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: dsZLyOah2GKD It is undocumented and has been deprecated since 2013. --- fftools/ffmpeg_filter.c | 17 ----------------- fftools/ffmpeg_opt.c | 3 --- 2 files changed, 20 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index b798459946..886419af32 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -805,23 +805,6 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, return ret; } - if (do_deinterlace) { - AVFilterContext *yadif; - - snprintf(name, sizeof(name), "deinterlace_in_%d_%d", - ist->file_index, ist->st->index); - if ((ret = avfilter_graph_create_filter(&yadif, - avfilter_get_by_name("yadif"), - name, "", NULL, - fg->graph)) < 0) - return ret; - - if ((ret = avfilter_link(last_filter, 0, yadif, 0)) < 0) - return ret; - - last_filter = yadif; - } - snprintf(name, sizeof(name), "trim_in_%d_%d", ist->file_index, ist->st->index); if (copy_ts) { diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 8cf932bc6c..c960830ff6 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -153,7 +153,6 @@ int audio_volume = 256; int audio_sync_method = 0; int video_sync_method = VSYNC_AUTO; float frame_drop_threshold = 0; -int do_deinterlace = 0; int do_benchmark = 0; int do_benchmark_all = 0; int do_hex_dump = 0; @@ -3779,8 +3778,6 @@ const OptionDef options[] = { { "passlogfile", OPT_VIDEO | HAS_ARG | OPT_STRING | OPT_EXPERT | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(passlogfiles) }, "select two pass log file name prefix", "prefix" }, - { "deinterlace", OPT_VIDEO | OPT_BOOL | OPT_EXPERT, { &do_deinterlace }, - "this option is deprecated, use the yadif filter instead" }, { "psnr", OPT_VIDEO | OPT_BOOL | OPT_EXPERT, { &do_psnr }, "calculate PSNR of compressed frames" }, { "vstats", OPT_VIDEO | OPT_EXPERT , { .func_arg = opt_vstats },