From patchwork Mon Aug 28 17:18:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 4866 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp2409213jao; Mon, 28 Aug 2017 10:19:56 -0700 (PDT) X-Received: by 10.28.27.20 with SMTP id b20mr795967wmb.12.1503940796652; Mon, 28 Aug 2017 10:19:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503940796; cv=none; d=google.com; s=arc-20160816; b=VlwlWUGGWHfZhwRaTPrl/fxX0sPeVBvhIbX+b5dzH7DmXfgo8xLYN/uXPD5Ilp7yI2 ANhChNAzhjTA9vUFXKMCiUM+p29QN+NOPleOwEZT8wYK6qc87B1WT247rxN6FdS17CWA 4qxFi3PFCxfWNblRCplRY+h7GGIYqgS39L8+O/hq3XypWjVMKEUywk78sp1hpYBqD5q+ Estw7Jik94GzO301rOeYMaY8voO07kMEm1OLIXgRBx3wHIXl82GkGvmF7ziI1ElOmXUP 7nx2jai7wbNNZuh1Ky0FSUBTz8x8oKdxrELRPk9ujtw3KNnTv7LAoCdPwagFrQhOW/Dz IWrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=gtdSQFAogQPea4BLgmeQy22qGDSndTXiDqf7hbyvvOM=; b=EQuq51PTSkcgTiMPUeR/89QkhwToLEhGR4zPbg8vtnn62iATSOYszq19iFZ1/WP3Gb inI5a3BtlSiJZ6/Av2UTU2oZ52f6LcCGumWR8elvCNuujAsXSQnkckh54RHIYMj3fJJi iyjrm6nmU84OOM1bvcod7aqkuSiqED1PwQq/mcfGNVxSYjt1r1WF4CabgtJKdiYTvxJh 1/H0hmGyCFAQAZwNlUiU7xomUwT4qG+i3c9Ye+ErNxF/G78cj09YZN9PEw0fXILlATuS NPdRwzGEdkwBpqh4rJxPzjxggOoVuOkB1j1fHBoh1P6RsPU0kxoIt8Va3NTAUFy83KLG LhaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=pO3zWBrz; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z6si751833wrz.15.2017.08.28.10.19.55; Mon, 28 Aug 2017 10:19:56 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=pO3zWBrz; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A9AF689F00; Mon, 28 Aug 2017 20:19:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f193.google.com (mail-qt0-f193.google.com [209.85.216.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1A05689D56 for ; Mon, 28 Aug 2017 20:19:35 +0300 (EEST) Received: by mail-qt0-f193.google.com with SMTP id g13so964134qta.4 for ; Mon, 28 Aug 2017 10:19:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=CmFIRghz4R1MIlMHfXuC+Mk9gGqQypWNwFfQdBnnm8g=; b=pO3zWBrzvElFwMKm9mrqGa33WiNZLiQTlEtvgfmzwa0FD9Xz+lE5/nWrjfIdNAOcm9 oOSHC/YqjedXFXblMJ5ns0qse4WJuTUvG6ydm5qyrsrKkjKaZG0iHWpOGEpDdjltxhx2 q8KwZ/Y/iaHSeVhBf5jIQqm4OFJTe88Np1w5YvHvlnKajBn4lyCMiHS5j/8wELVQcP0A RAX2MqQUoxGaqBVJTSkUAw1nBv1nU2l6lRDklUWF1RWlUt/qq0eSHQ+QuDQFmF9W0XdH LJGSePmF/4tPq8dL1IxeGwQ4CI1FRO9yQbRUihXnR1foONYdrNNTudq2U1ydZTSmpSWk r1MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=CmFIRghz4R1MIlMHfXuC+Mk9gGqQypWNwFfQdBnnm8g=; b=YvzclO94qhG2rFzpvPxVPs2njTRMhWYbVcbBGRZGmRJJuFiXbJ6IQaiJPh84Ev/6Sj brKmW7GHJZR0+S76A5+9VkWXG5YTFIeBxHxxapy2hOje96wX+rnjvpHBFiGTIkMWMnVW tmJST2AmmFlR72LQ30O227vSgM7xfMVyBNOgzlVbmjJCzGmVoqkBW1vZXcie2iokQRbX YZwfFssIzOD1b0+k1itU3pUTaf9QBOUXgmG9mfKiTgxxcyDBWZ6kxM8kxtV6fa1uhyBW 3NXlqKhhe5Fft9A02xkOvY0a6tvFjUsUCRpNWc85C+rCC56hpcEVj+fED/zntVDtjIzn HPZQ== X-Gm-Message-State: AHYfb5hSE+v179Hmmjg0XpE3QyAts1WX+58FDFqSbHLpVJ8tolkLa6cx 1xjqA1BTYVeb6Jd2 X-Received: by 10.237.62.219 with SMTP id o27mr1848264qtf.199.1503940784460; Mon, 28 Aug 2017 10:19:44 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id b29sm586152qkb.78.2017.08.28.10.19.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Aug 2017 10:19:43 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Aug 2017 14:18:53 -0300 Message-Id: <20170828171853.9312-1-jamrial@gmail.com> X-Mailer: git-send-email 2.13.3 Subject: [FFmpeg-devel] [PATCH] avfilter/mcdeint: remove usage of deprecated AVCodecContext.me_method 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" Signed-off-by: James Almer --- Depends on patch "avcodec/snowenc: fix setting motion_est option" libavfilter/vf_mcdeint.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_mcdeint.c b/libavfilter/vf_mcdeint.c index 26387b84e7..f07e1a0d60 100644 --- a/libavfilter/vf_mcdeint.c +++ b/libavfilter/vf_mcdeint.c @@ -52,6 +52,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavcodec/avcodec.h" +#include "libavcodec/snow.h" #include "avfilter.h" #include "formats.h" #include "internal.h" @@ -134,7 +135,7 @@ static int config_props(AVFilterLink *inlink) case MODE_EXTRA_SLOW: enc_ctx->refs = 3; case MODE_SLOW: - enc_ctx->me_method = ME_ITER; + av_dict_set(&opts, "motion_est", AV_STRINGIFY(FF_ME_ITER), 0); case MODE_MEDIUM: enc_ctx->flags |= AV_CODEC_FLAG_4MV; enc_ctx->dia_size = 2;