[FFmpeg-cvslog] Revert "Revert "yadif: add parens around macro parameters""

Robert Krüger git at videolan.org
Tue Jan 14 14:36:17 CET 2014


ffmpeg | branch: master | Robert Krüger <krueger at lesspain.de> | Sat Jan  4 13:50:05 2014 +0100| [99c4abfe8862ec2e4c724af249799ca076a35a91] | committer: Michael Niedermayer

Revert "Revert "yadif: add parens around macro parameters""

This reverts commit ab00800cde1af1f252731118062dd5149f1a7ed7.

Signed-off-by: Robert Krüger <krueger at lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=99c4abfe8862ec2e4c724af249799ca076a35a91
---

 libavfilter/vf_yadif.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
index 933534d..1857ca9 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. */



More information about the ffmpeg-cvslog mailing list