diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-22 10:20:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-22 10:23:46 +0200 |
| commit | b909428dabe31b6c55fff57d743b3eaddd449e7a (patch) | |
| tree | cdb30ad48c128245dd02d97d4d6a4e1242e0cc7a /libavcodec/libx264.c | |
| parent | 5feaa451bb6513952c3c7acbccb6f5cf17a40790 (diff) | |
| parent | 4719040cd1b54381796b22056a9ae37bd2b4668d (diff) | |
| download | ffmpeg-b909428dabe31b6c55fff57d743b3eaddd449e7a.tar.gz | |
Merge commit '4719040cd1b54381796b22056a9ae37bd2b4668d'
* commit '4719040cd1b54381796b22056a9ae37bd2b4668d':
libx264: Define X264_API_IMPORTS on MSVC/ICL
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libx264.c')
| -rw-r--r-- | libavcodec/libx264.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 0a1341263c..553c57ee46 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -25,6 +25,11 @@ #include "libavutil/pixdesc.h" #include "avcodec.h" #include "internal.h" + +#if defined(_MSC_VER) +#define X264_API_IMPORTS 1 +#endif + #include <x264.h> #include <float.h> #include <math.h> |