From ab00800cde1af1f252731118062dd5149f1a7ed7 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 1 Dec 2013 16:37:18 +0100 Subject: Revert "yadif: add parens around macro parameters" This reverts commit 49e617f9565b6528fe707bae7ea4b62b10c771a5. This reduces the amount of non LGPL code, making a relicensing to LGPL easier Conflicts: libavfilter/vf_yadif.c Signed-off-by: Michael Niedermayer --- libavfilter/vf_yadif.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavfilter') diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c index 1857ca9d87..933534d551 100644 --- a/libavfilter/vf_yadif.c +++ b/libavfilter/vf_yadif.c @@ -38,12 +38,12 @@ typedef struct ThreadData { } ThreadData; #define CHECK(j)\ - { int score = FFABS(cur[mrefs - 1 + (j)] - cur[prefs - 1 - (j)])\ - + FFABS(cur[mrefs +(j)] - cur[prefs -(j)])\ - + FFABS(cur[mrefs + 1 + (j)] - cur[prefs + 1 - (j)]);\ + { int score = FFABS(cur[mrefs - 1 + j] - cur[prefs - 1 - j])\ + + FFABS(cur[mrefs + j] - cur[prefs - j])\ + + FFABS(cur[mrefs + 1 + j] - cur[prefs + 1 - j]);\ if (score < spatial_score) {\ spatial_score= score;\ - spatial_pred= (cur[mrefs +(j)] + cur[prefs -(j)])>>1;\ + spatial_pred= (cur[mrefs + j] + cur[prefs - j])>>1;\ /* The is_not_edge argument here controls when the code will enter a branch * which reads up to and including x-3 and x+3. */ -- cgit v1.2.3