Mercurial > libavcodec.hg

changeset 4120:8fe20344c9b5 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename SWAP macro to FFSWAP.
author diego
date Wed, 01 Nov 2006 21:28:36 +0000
parents 85438e10d72d
children fb40acd09af3
files dsicinav.c mpegvideo.c
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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;