Commit c9cd990d authored by James Almer's avatar James Almer

Merge commit '3152058b'

* commit '3152058b':
  libavcodec: Don't use dllexport, only dllimport when building DLLs
Merged-by: 's avatarJames Almer <jamrial@gmail.com>
parents c6f7eb86 3152058b
...@@ -4957,7 +4957,7 @@ case $target_os in ...@@ -4957,7 +4957,7 @@ case $target_os in
mingw32*|mingw64*) mingw32*|mingw64*)
target_os=mingw32 target_os=mingw32
if enabled shared; then if enabled shared; then
# Cannot build both shared and static libs when using dllexport. # Cannot build both shared and static libs when using dllimport.
disable static disable static
fi fi
enabled shared && ! enabled small && check_cmd $windres --version && enable gnu_windres enabled shared && ! enabled small && check_cmd $windres --version && enable gnu_windres
......
...@@ -414,12 +414,8 @@ int ff_alloc_a53_sei(const AVFrame *frame, size_t prefix_len, ...@@ -414,12 +414,8 @@ int ff_alloc_a53_sei(const AVFrame *frame, size_t prefix_len,
*/ */
int64_t ff_guess_coded_bitrate(AVCodecContext *avctx); int64_t ff_guess_coded_bitrate(AVCodecContext *avctx);
#if defined(_WIN32) && CONFIG_SHARED #if defined(_WIN32) && CONFIG_SHARED && !defined(BUILDING_avcodec)
#ifdef BUILDING_avcodec
# define av_export_avcodec __declspec(dllexport)
#else
# define av_export_avcodec __declspec(dllimport) # define av_export_avcodec __declspec(dllimport)
#endif
#else #else
# define av_export_avcodec # define av_export_avcodec
#endif #endif
......
...@@ -63,12 +63,8 @@ ...@@ -63,12 +63,8 @@
#endif #endif
#endif #endif
#if defined(_WIN32) && CONFIG_SHARED #if defined(_WIN32) && CONFIG_SHARED && !defined(BUILDING_avutil)
#ifdef BUILDING_avutil
# define av_export_avutil __declspec(dllexport)
#else
# define av_export_avutil __declspec(dllimport) # define av_export_avutil __declspec(dllimport)
#endif
#else #else
# define av_export_avutil # define av_export_avutil
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment