Browse Source

Merge commit '4719040cd1b54381796b22056a9ae37bd2b4668d'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.1
Michael Niedermayer 12 years ago
parent
commit
b909428dab
1 changed files with 5 additions and 0 deletions
  1. +5
    -0
      libavcodec/libx264.c

+ 5
- 0
libavcodec/libx264.c View File

@@ -25,6 +25,11 @@
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"

#if defined(_MSC_VER)
#define X264_API_IMPORTS 1
#endif

#include <x264.h> #include <x264.h>
#include <float.h> #include <float.h>
#include <math.h> #include <math.h>


Loading…
Cancel
Save