diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-19 18:26:45 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-19 18:26:45 -0300 |
| commit | c9cd990dcc8e3bdfb3be8eacd6ce62e1da8b4077 (patch) | |
| tree | bcda783886df572c4cf966efd8510be717f4595f /libavcodec/internal.h | |
| parent | c6f7eb86639f7efffa777c5732fa41d89fdd2ff9 (diff) | |
| parent | 3152058bf1dca318898550efacf0286f4836cae6 (diff) | |
| download | ffmpeg-c9cd990dcc8e3bdfb3be8eacd6ce62e1da8b4077.tar.gz | |
Merge commit '3152058bf1dca318898550efacf0286f4836cae6'
* commit '3152058bf1dca318898550efacf0286f4836cae6':
libavcodec: Don't use dllexport, only dllimport when building DLLs
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/internal.h')
| -rw-r--r-- | libavcodec/internal.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index d47ce0e93d..d3310b6afe 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -414,12 +414,8 @@ int ff_alloc_a53_sei(const AVFrame *frame, size_t prefix_len, */ 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) -#endif #else # define av_export_avcodec #endif |