# HG changeset patch
# User mru
# Date 1279648465 0
# Node ID c4b53914f286b12a50284de0e662592aee55d9bf
# Parent  b768afb88d1a25c3ba8d414c57d99053695c16cb
vp8: add do { } while(0) around XCHG() macro to avoid confusing if/else

This is the correct solution to the warning "fixed" in the previous
commit.

diff -r b768afb88d1a -r c4b53914f286 vp8.c
--- a/vp8.c	Tue Jul 20 17:45:54 2010 +0000
+++ b/vp8.c	Tue Jul 20 17:54:25 2010 +0000
@@ -882,16 +882,17 @@
     src_cb -= uvlinesize;
     src_cr -= uvlinesize;
 
-#define XCHG(a,b,xchg)\
+#define XCHG(a,b,xchg) do {\
 if (xchg) AV_SWAP64(b,a);\
-else      AV_COPY64(b,a);
+else      AV_COPY64(b,a);\
+} while (0)
 
     XCHG(top_border_m1+8, src_y-8, xchg);
     XCHG(top_border,      src_y,   xchg);
     XCHG(top_border+8,    src_y+8, 1);
-    if (mb_x < mb_width-1) {
+    if (mb_x < mb_width-1)
         XCHG(top_border+32, src_y+16, 1);
-    }
+
     // only copy chroma for normal loop filter
     // or to initialize the top row to 127
     if (!simple || !mb_y) {