[Ffmpeg-cvslog] r6865 - in trunk: libavcodec/dsicinav.c libavcodec/mpegvideo.c libavformat/utils.c libavutil/common.h

[diego]

Author: diego
Date: Wed Nov  1 22:28:36 2006
New Revision: 6865

Modified:
   trunk/libavcodec/dsicinav.c
   trunk/libavcodec/mpegvideo.c
   trunk/libavformat/utils.c
   trunk/libavutil/common.h

Log:
Rename SWAP macro to FFSWAP.


Modified: trunk/libavcodec/dsicinav.c
==============================================================================
--- trunk/libavcodec/dsicinav.c	(original)
+++ trunk/libavcodec/dsicinav.c	Wed Nov  1 22:28:36 2006
@@ -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;

Modified: trunk/libavcodec/mpegvideo.c
==============================================================================
--- trunk/libavcodec/mpegvideo.c	(original)
+++ trunk/libavcodec/mpegvideo.c	Wed Nov  1 22:28:36 2006
@@ -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;

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	(original)
+++ trunk/libavformat/utils.c	Wed Nov  1 22:28:36 2006
@@ -2230,7 +2230,7 @@
         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];
     }

Modified: trunk/libavutil/common.h
==============================================================================
--- trunk/libavutil/common.h	(original)
+++ trunk/libavutil/common.h	Wed Nov  1 22:28:36 2006
@@ -198,7 +198,7 @@
 #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];