diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2011-07-29 10:32:30 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2011-07-29 10:32:30 +0400 |
| commit | b46d8955509e805f06b76a6fd800ecb4edee113b (patch) | |
| tree | 7ed0b1a3b5d04ab48d3e9062ff02ce54961ecb06 /source/gameengine/VideoTexture/VideoFFmpeg.h | |
| parent | 6960127d2609620d52620539388ada5cb466bab2 (diff) | |
| parent | 26589497529ca3c8da85391d4976d286a371e258 (diff) | |
Merging r36529-38806bge_components
Diffstat (limited to 'source/gameengine/VideoTexture/VideoFFmpeg.h')
| -rw-r--r-- | source/gameengine/VideoTexture/VideoFFmpeg.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.h b/source/gameengine/VideoTexture/VideoFFmpeg.h index 9b09c485329..139b90dc463 100644 --- a/source/gameengine/VideoTexture/VideoFFmpeg.h +++ b/source/gameengine/VideoTexture/VideoFFmpeg.h @@ -31,17 +31,15 @@ http://www.gnu.org/copyleft/lesser.txt. extern "C" { #undef __cplusplus #include <pthread.h> -#include <libavformat/avformat.h> -#include <libavcodec/avcodec.h> -#include <libavutil/rational.h> -#include <libswscale/swscale.h> + +#include "ffmpeg_compat.h" + #include "DNA_listBase.h" #include "BLI_threads.h" #include "BLI_blenlib.h" #define __cplusplus } - #if LIBAVFORMAT_VERSION_INT < (49 << 16) #define FFMPEG_OLD_FRAME_RATE 1 #else |