diff src/ffmpeg/libavutil/common.h @ 818:07107d476f32 trunk

[svn] - remove some more stuff - build libavcodec directly into the module
author nenolod
date Mon, 12 Mar 2007 13:49:56 -0700
parents e8776388b02a
children 3cbdc6e19d7c
line wrap: on
line diff
--- a/src/ffmpeg/libavutil/common.h	Mon Mar 12 13:14:40 2007 -0700
+++ b/src/ffmpeg/libavutil/common.h	Mon Mar 12 13:49:56 2007 -0700
@@ -198,6 +198,7 @@
 #define FFMAX(a,b) ((a) > (b) ? (a) : (b))
 #define FFMIN(a,b) ((a) > (b) ? (b) : (a))
 
+#undef SWAP
 #define SWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
 
 /* misc math functions */