# HG changeset patch
# User diego
# Date 1162416516 0
# Node ID 8fe20344c9b5df83c1832656c608dc7227bb3996
# Parent  85438e10d72d108d80f6d60b58e7ee45f9aa37bb
Rename SWAP macro to FFSWAP.

diff -r 85438e10d72d -r 8fe20344c9b5 dsicinav.c
--- a/dsicinav.c	Wed Nov 01 21:09:14 2006 +0000
+++ b/dsicinav.c	Wed Nov 01 21:28:36 2006 +0000
@@ -278,7 +278,7 @@
           cin->bitmap_table[CIN_CUR_BMP] + y * cin->avctx->width,
           cin->avctx->width);
 
-    SWAP(uint8_t *, cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_table[CIN_PRE_BMP]);
+    FFSWAP(uint8_t *, cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_table[CIN_PRE_BMP]);
 
     *data_size = sizeof(AVFrame);
     *(AVFrame *)data = cin->frame;
diff -r 85438e10d72d -r 8fe20344c9b5 mpegvideo.c
--- a/mpegvideo.c	Wed Nov 01 21:09:14 2006 +0000
+++ b/mpegvideo.c	Wed Nov 01 21:28:36 2006 +0000
@@ -1705,8 +1705,8 @@
 
     if(FFABS(ex - sx) > FFABS(ey - sy)){
         if(sx > ex){
-            SWAP(int, sx, ex);
-            SWAP(int, sy, ey);
+            FFSWAP(int, sx, ex);
+            FFSWAP(int, sy, ey);
         }
         buf+= sx + sy*stride;
         ex-= sx;
@@ -1719,8 +1719,8 @@
         }
     }else{
         if(sy > ey){
-            SWAP(int, sx, ex);
-            SWAP(int, sy, ey);
+            FFSWAP(int, sx, ex);
+            FFSWAP(int, sy, ey);
         }
         buf+= sx + sy*stride;
         ey-= sy;