diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-06 08:46:47 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-06 08:46:47 +0400 |
| commit | df29e91a697fbc89dea9c38282f3283e2fee7cc5 (patch) | |
| tree | 949a95862aecbb4fbe8e93e7428687cde42c50c8 /source/gameengine/VideoTexture/VideoFFmpeg.h | |
| parent | 110a1526b62aa738ac0639ba51d93e2e7611751d (diff) | |
code cleanup: header cleanup, remove commented workaround for mingw since its no longer needed.
Diffstat (limited to 'source/gameengine/VideoTexture/VideoFFmpeg.h')
| -rw-r--r-- | source/gameengine/VideoTexture/VideoFFmpeg.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.h b/source/gameengine/VideoTexture/VideoFFmpeg.h index ee4354e256e..d3458211949 100644 --- a/source/gameengine/VideoTexture/VideoFFmpeg.h +++ b/source/gameengine/VideoTexture/VideoFFmpeg.h @@ -28,30 +28,26 @@ http://www.gnu.org/copyleft/lesser.txt. #define __VIDEOFFMPEG_H__ #ifdef WITH_FFMPEG -#if defined(__FreeBSD__) /* this needs to be parsed with __cplusplus defined before included through ffmpeg_compat.h */ -#include <inttypes.h> +#if defined(__FreeBSD__) +# include <inttypes.h> #endif extern "C" { -// #undef __cplusplus // was done for mingw4.4, see r23608 #include <pthread.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 +# define FFMPEG_OLD_FRAME_RATE 1 #else -#define FFMPEG_CODEC_IS_POINTER 1 +# define FFMPEG_CODEC_IS_POINTER 1 #endif #if LIBAVFORMAT_VERSION_INT >= (52 << 16) -#define FFMPEG_PB_IS_POINTER 1 +# define FFMPEG_PB_IS_POINTER 1 #endif #ifdef FFMPEG_CODEC_IS_POINTER |