From patchwork Mon Jan 8 08:16:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 7197 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp2371643jaa; Mon, 8 Jan 2018 00:17:07 -0800 (PST) X-Google-Smtp-Source: ACJfBovNp+SR1ChKfiYlMv1T/0NCeqAohm2I+Z1Gb5opWURzfChLapKJC49gjsrF5HtfHymYqJFk X-Received: by 10.28.50.67 with SMTP id y64mr8515025wmy.72.1515399426916; Mon, 08 Jan 2018 00:17:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515399426; cv=none; d=google.com; s=arc-20160816; b=xz/0EAzipUhmi3H7GwwLEs1cIhGHqKW8TQVKgnKUaCUScPwh8SFKq9ZFbKD8I94Vc1 3s8EkYwDYhfQ2O1FQ+Alndi2jtPPPdStnUWX4kIEUWj95iR7qY0rQacQO40AbpzKl0CF EjK3E8MnMQjtLI2TA3Wcjun/4HlPzA1SY62xyD0Ik7VH+m9UNHMhGaCNackUneBA60Eg p/UpVPuEkAkYVR+VjfTS4cyXJWOW1h+1vRMF085N27bXPsGvnfsJUdPGLHnskILuqVCJ NGqUVHcij4i3CNLQFeknP4T4pLkltcKkl4ZRFM3haMW5DIa1Y5qVP9MFf+fX9088VAtw 2oBA== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:message-id:date:to:from :delivered-to:arc-authentication-results; bh=9xTgAeV3PEp9/LnV0+faNK0Ng9KhKVhy3EnHXjGghbY=; b=uqk4w3xQgI+sMkwXXtmBjjr/cUQQk2jJOzwya/WyWOLZtfCSRsc6yhk7PIo+xLJVGr w4f1j0eNqBE0McEFO9CzCS/tKC/XDZOrb7vB8QE0HTdwVY0lRAy1nA1ISnEvcIj2SK0l TSEsvf4W4ntcVq28u20mp/uJfd8CZziKvMBakTaR91iHiZvzTglHcPdf9SUxNpnxugt8 ikYKLgRA7reeHPdoD+Bt4GdXg+Fx0/Yh+eBIFamJwtNipbBKxXFPIp1SzgybqbLh4Is4 Gaf/VQQVKEJ5ALH8fcMubuJqQuaTlByIvsFEgEtEyEaT08gQ/qBpQON8woMAU0lbuhe4 eNpQ== 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 d14si4984891wrg.401.2018.01.08.00.17.06; Mon, 08 Jan 2018 00:17:06 -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 D5AAF689E38; Mon, 8 Jan 2018 10:17:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgau2.qq.com (smtpbgau2.qq.com [54.206.34.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DDD5B689C95 for ; Mon, 8 Jan 2018 10:16:55 +0200 (EET) X-QQ-mid: bizesmtp14t1515399400tgy820m0 Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Mon, 08 Jan 2018 16:16:39 +0800 (CST) X-QQ-SSF: 01100000004000F0FKF0000A0000000 X-QQ-FEAT: 3jlOKZxptE4sHdDZPKVZ7IVZWXODIHMnI+Vpm29Q7MNL25rmw+WQy/E51pRUM PkQFKiRVjSfH4p93d309fDb+rnmQ0Nl8Vf2qhF5U7UPozsC3KG8caF8auFNdsxhYhoHsmMA 7rTYykWEi110UJ7bXSwhGoZ6XF8/eitl7birAIUF9XlF9tNilZctKrruQgFY2rG4TspS02Z Oi6qeESYm6bHI+OqVtiPGl449erD8YyHcmRmu0uAae/DKIht/q6xRFESk/A54QTx5NYjASf NPtgU1qIwd5ZCdwUQ3BVm+MeocypsYe003BA== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Jan 2018 16:16:37 +0800 Message-Id: <20180108081637.10956-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign4 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_overlay: remove duplicate parse line 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: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" duplicate av_expr_eval x_pexpr, remove the second one. Signed-off-by: Steven Liu --- libavfilter/vf_overlay.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index aa5835ae3a..240f6f3803 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -149,7 +149,6 @@ static void eval_expr(AVFilterContext *ctx) s->var_values[VAR_X] = av_expr_eval(s->x_pexpr, s->var_values, NULL); s->var_values[VAR_Y] = av_expr_eval(s->y_pexpr, s->var_values, NULL); - s->var_values[VAR_X] = av_expr_eval(s->x_pexpr, s->var_values, NULL); s->x = normalize_xy(s->var_values[VAR_X], s->hsub); s->y = normalize_xy(s->var_values[VAR_Y], s->vsub); }