Rename SWAP macro to FFSWAP.

Originally committed as revision 6865 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/dsicinav.c b/libavcodec/dsicinav.c
index 59a4345..ded53c4 100644 (file)
--- a/libavcodec/dsicinav.c
+++ b/libavcodec/dsicinav.c
@@ -278,7 +278,7 @@ static int cinvideo_decode_frame(AVCodecContext *avctx,
           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 --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 576a6b8..9bfb66b 100644 (file)
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -1705,8 +1705,8 @@ static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h
 
     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 @@ static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h
         }
     }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;

diff --git a/libavformat/utils.c b/libavformat/utils.c
index e396cf5..d99ecc0 100644 (file)
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2230,7 +2230,7 @@ static int compute_pkt_fields2(AVStream *st, AVPacket *pkt){
         for(i=1; i<delay+1 && st->pts_buffer[i] == AV_NOPTS_VALUE; i++)
             st->pts_buffer[i]= (i-delay-1) * pkt->duration;
         for(i=0; i<delay && st->pts_buffer[i] > st->pts_buffer[i+1]; i++)
-            SWAP(int64_t, st->pts_buffer[i], st->pts_buffer[i+1]);
+            FFSWAP(int64_t, st->pts_buffer[i], st->pts_buffer[i+1]);
 
         pkt->dts= st->pts_buffer[0];
     }

diff --git a/libavutil/common.h b/libavutil/common.h
index 583273a..babdab2 100644 (file)
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -198,7 +198,7 @@ typedef uint64_t      uint_fast64_t;
 #define FFMAX(a,b) ((a) > (b) ? (a) : (b))
 #define FFMIN(a,b) ((a) > (b) ? (b) : (a))
 
-#define SWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
+#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
 
 /* misc math functions */
 extern FF_IMPORT_ATTR const uint8_t ff_log2_tab[256];