diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 15:29:24 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 15:29:24 +0400 |
commit | b0554fec0470bf59b0582c80697d28646e37b854 (patch) | |
tree | 1f111a02df3a1e29f29ed963fb32ccfa72f2cce1 /libavutil/internal.h | |
parent | d50aa006fb3430bedc3872ba10e028a714499625 (diff) | |
parent | c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72 (diff) |
Merge commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72'
* commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72':
fate: add a dependency helper macro
Add support for building shared libraries with MSVC
avcodec: Rename avpriv_frame_rate_tab to ff_mpeg12_frame_rate_tab
gxf: Add a local copy of the relevant parts of the frame rate table
configure: Split out msvc as a separate target OS
aviobuf: Remove a senseless ifdef in avio_seek
Conflicts:
configure
libavcodec/dirac.c
libavcodec/mpeg12data.h
libavcodec/mpeg12enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/internal.h')
-rw-r--r-- | libavutil/internal.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavutil/internal.h b/libavutil/internal.h index f18e37a243..778497293c 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -48,6 +48,12 @@ #endif #endif +#if defined(_MSC_VER) && CONFIG_SHARED +# define av_export __declspec(dllimport) +#else +# define av_export +#endif + #ifndef INT_BIT # define INT_BIT (CHAR_BIT * sizeof(int)) #endif |