RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '3152058bf1dca318898550efacf0286f4836cae6' 

* commit '3152058bf1dca318898550efacf0286f4836cae6':
  libavcodec: Don't use dllexport, only dllimport when building DLLs

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-11-19 18:26:45 -03:00
parent c6f7eb8663 3152058bf1
commit c9cd990dcc
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -4957,7 +4957,7 @@ case $target_os in
mingw32*|mingw64*)
target_os=mingw32
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
fi
enabled shared && ! enabled small && check_cmd $windres --version && enable gnu_windres

6
libavcodec/internal.h
View File

@ -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

6
libavutil/internal.h
View File

@ -63,12 +63,8 @@
#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)
#endif
#else
# define av_export_avutil
#endif