diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-06-17 23:11:02 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-06-17 23:32:01 +0300 |
commit | 3ce4a58aa90d93d1d0f1ec5dcc63a482d1b1af78 (patch) | |
tree | 18092e9ebdfef53914618f4fc9faf042b8be62aa /source/blender/imbuf | |
parent | 937ecaf77eff307455c5825cb91f1072c4d3c3aa (diff) |
Cleanup: duplicate includes
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r-- | source/blender/imbuf/intern/IMB_anim.h | 6 | ||||
-rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 9 | ||||
-rw-r--r-- | source/blender/imbuf/intern/indexer.c | 1 |
3 files changed, 3 insertions, 13 deletions
diff --git a/source/blender/imbuf/intern/IMB_anim.h b/source/blender/imbuf/intern/IMB_anim.h index 1fc43e22f68..690ec813407 100644 --- a/source/blender/imbuf/intern/IMB_anim.h +++ b/source/blender/imbuf/intern/IMB_anim.h @@ -79,11 +79,7 @@ #endif #ifdef WITH_REDCODE -# ifdef _WIN32 /* on windows we use the one in extern instead */ -# include "libredcode/format.h" -# else -# include "libredcode/format.h" -# endif +# include "libredcode/format.h" #endif #include "IMB_imbuf_types.h" diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index 2c8431d25ea..e2d56d29726 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -99,13 +99,8 @@ #endif //WITH_FFMPEG #ifdef WITH_REDCODE -#ifdef _WIN32 /* on windows we use the ones in extern instead */ -#include "libredcode/format.h" -#include "libredcode/codec.h" -#else -#include "libredcode/format.h" -#include "libredcode/codec.h" -#endif +# include "libredcode/format.h" +# include "libredcode/codec.h" #endif #include "IMB_colormanagement.h" diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c index 0509dea89d5..ac57b095800 100644 --- a/source/blender/imbuf/intern/indexer.c +++ b/source/blender/imbuf/intern/indexer.c @@ -41,7 +41,6 @@ #include "IMB_anim.h" #include "imbuf.h" -#include "MEM_guardedalloc.h" #include "BKE_global.h" #ifdef WITH_AVI |