Merge commit '3152058bf1dca318898550efacf0286f4836cae6'

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

Merged-by: James Almer <jamrial@gmail.com>

diff --cc configure
index efd7ffecdec6f9f5df82510fe3d25d3c07125a68,7f320fee18d63c43a37290232b2c898624943dff..8262358138b1c7e09aa81d00ddb9e815b11b0eff
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -4957,11 -3883,11 +4957,11 @@@ case $target_os i
      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
 -        check_ldflags -Wl,--nxcompat
 -        check_ldflags -Wl,--dynamicbase
 +        enabled shared && ! enabled small && check_cmd $windres --version && enable gnu_windres
 +        enabled x86_32 && check_ldflags -Wl,--large-address-aware
          shlibdir_default="$bindir_default"
          SLIBPREF=""
          SLIBSUF=".dll"

diff --cc libavcodec/internal.h
index d47ce0e93d55590f143fe372fef19064bb3b1ab2,868e3dfc541ed1eeee06905566e05b4b92ad12bd..d3310b6afe562080c1877ee706fb0426a105cab2
--- 1/libavcodec/internal.h
--- 2/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@@ -391,35 -285,8 +391,31 @@@ int ff_decode_frame_props(AVCodecContex
   */
  AVCPBProperties *ff_add_cpb_side_data(AVCodecContext *avctx);
  
- #if defined(_WIN32) && CONFIG_SHARED
- #ifdef BUILDING_avcodec
- #    define av_export_avcodec __declspec(dllexport)
- #else
 +int ff_side_data_set_encoder_stats(AVPacket *pkt, int quality, int64_t *error, int error_count, int pict_type);
 +
 +/**
 + * Check AVFrame for A53 side data and allocate and fill SEI message with A53 info
 + *
 + * @param frame      Raw frame to get A53 side data from
 + * @param prefix_len Number of bytes to allocate before SEI message
 + * @param data       Pointer to a variable to store allocated memory
 + *                   Upon return the variable will hold NULL on error or if frame has no A53 info.
 + *                   Otherwise it will point to prefix_len uninitialized bytes followed by
 + *                   *sei_size SEI message
 + * @param sei_size   Pointer to a variable to store generated SEI message length
 + * @return           Zero on success, negative error code on failure
 + */
 +int ff_alloc_a53_sei(const AVFrame *frame, size_t prefix_len,
 +                     void **data, size_t *sei_size);
 +
 +/**
 + * Get an estimated video bitrate based on frame size, frame rate and coded
 + * bits per pixel.
 + */
 +int64_t ff_guess_coded_bitrate(AVCodecContext *avctx);
 +
+ #if defined(_WIN32) && CONFIG_SHARED && !defined(BUILDING_avcodec)
  #    define av_export_avcodec __declspec(dllimport)
- #endif
  #else
  #    define av_export_avcodec
  #endif

diff --cc libavutil/internal.h
index 72ae0ad89b2bc75f0645aceb95adae5160b99267,7071d2a587b18b5d0ee9bbb3bd6eaeffcf941027..c77dfa7d3c2c9d842ae7985d23fa848288791e41
--- 1/libavutil/internal.h
--- 2/libavutil/internal.h
+++ b/libavutil/internal.h
@@@ -63,18 -57,8 +63,14 @@@
  #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
 +
  #if HAVE_PRAGMA_DEPRECATED
 -#    if defined(__ICL)
 +#    if defined(__ICL) || defined (__INTEL_COMPILER)
  #        define FF_DISABLE_DEPRECATION_WARNINGS __pragma(warning(push)) __pragma(warning(disable:1478))
  #        define FF_ENABLE_DEPRECATION_WARNINGS  __pragma(warning(pop))
  #    elif defined(_MSC_VER)