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

Merge commit '4719040cd1b54381796b22056a9ae37bd2b4668d' 

* commit '4719040cd1b54381796b22056a9ae37bd2b4668d':
  libx264: Define X264_API_IMPORTS on MSVC/ICL

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-22 10:20:05 +02:00
parent 5feaa451bb 4719040cd1
commit b909428dab
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/libx264.c
View File

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