fix mingw shared build, and get rid of FF_IMPORT_ATTR

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

diff --git a/configure b/configure
index 00d10a2..a515bac 100755 (executable)
--- a/configure
+++ b/configure
@@ -1072,7 +1072,7 @@ EOF
     SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
     SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)'
     SLIB_EXTRA_CMD="-lib /machine:i386 /def:\$(@:${SLIBSUF}=.def)"
-    SHFLAGS="-shared -Wl,--output-def,\$(@:${SLIBSUF}=.def),--out-implib,lib\$(SLIBNAME:\$(SLIBSUF)=.dll.a)"
+    SHFLAGS="-shared -Wl,--output-def,\$(@:${SLIBSUF}=.def),--out-implib,lib\$(SLIBNAME:\$(SLIBSUF)=.dll.a) -Wl,--enable-runtime-pseudo-reloc"
 fi
 
 # Combine FFLDFLAGS and the LDFLAGS environment variable.

diff --git a/libavutil/common.h b/libavutil/common.h
index 65573f0..77b1c3f 100644 (file)
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -58,13 +58,6 @@
 #define UINT64_C(c)    (c ## ULL)
 #endif
 
-#if defined(__MINGW32__) && !defined(BUILD_AVUTIL) && defined(BUILD_SHARED_AV)
-#  define FF_IMPORT_ATTR __declspec(dllimport)
-#else
-#  define FF_IMPORT_ATTR
-#endif
-
-
 #ifdef HAVE_AV_CONFIG_H
 /* only include the following when compiling package */
 #    include "internal.h"
@@ -83,7 +76,7 @@
 #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];
+extern const uint8_t ff_log2_tab[256];
 
 static inline int av_log2(unsigned int v)
 {

diff --git a/libavutil/internal.h b/libavutil/internal.h
index b9299bf..6e3e47a 100644 (file)
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -229,7 +229,7 @@ extern const uint32_t ff_inverse[256];
 #    define FASTDIV(a,b)   ((a)/(b))
 #endif
 
-extern FF_IMPORT_ATTR const uint8_t ff_sqrt_tab[128];
+extern const uint8_t ff_sqrt_tab[128];
 
 static inline int ff_sqrt(int a)
 {