* commit '3152058bf1dca318898550efacf0286f4836cae6': libavcodec: Don't use dllexport, only dllimport when building DLLs Merged-by: James Almer <jamrial@gmail.com>tags/n4.0
| @@ -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, | |||||
| */ | */ | ||||
| int64_t ff_guess_coded_bitrate(AVCodecContext *avctx); | int64_t ff_guess_coded_bitrate(AVCodecContext *avctx); | ||||
| #if defined(_WIN32) && CONFIG_SHARED | |||||
| #ifdef BUILDING_avcodec | |||||
| # define av_export_avcodec __declspec(dllexport) | |||||
| #else | |||||
| #if defined(_WIN32) && CONFIG_SHARED && !defined(BUILDING_avcodec) | |||||
| # 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 @@ | |||||
| #endif | #endif | ||||
| #endif | #endif | ||||
| #if defined(_WIN32) && CONFIG_SHARED | |||||
| #ifdef BUILDING_avutil | |||||
| # define av_export_avutil __declspec(dllexport) | |||||
| #else | |||||
| #if defined(_WIN32) && CONFIG_SHARED && !defined(BUILDING_avutil) | |||||
| # 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 | ||||