diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-02 16:18:10 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-02 16:18:10 +0300 |
| commit | 89fdd8890633700f559039998f8d95c7a5f97df4 (patch) | |
| tree | a77306882df479d5d2d89f0f9d3529394b4fbe01 /source/blender/imbuf | |
| parent | 57bbd478a58a944a8f3146af25cfe34ee055fc86 (diff) | |
| parent | 4ffa05c30b10eb8a07dd0a9b43466f6d11bc1364 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 3 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/util.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index 979b7d9b814..cc8a38d5bf4 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -68,7 +68,6 @@ #include "MEM_guardedalloc.h" - #ifdef WITH_AVI # include "AVI_avi.h" #endif @@ -83,6 +82,8 @@ #include "IMB_indexer.h" #ifdef WITH_FFMPEG +# include "BKE_global.h" /* ENDIAN_ORDER */ + # include <libavformat/avformat.h> # include <libavcodec/avcodec.h> # include <libavutil/rational.h> diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 2b6963b9170..9dfe926ddff 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -43,7 +43,6 @@ #include "BLI_fileops.h" #include "BLI_string.h" - #include "imbuf.h" #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" @@ -52,6 +51,7 @@ #include "IMB_anim.h" #ifdef WITH_FFMPEG +#include "BKE_global.h" /* G.debug */ #include <libavcodec/avcodec.h> #include <libavformat/avformat.h> #include <libavdevice/avdevice.h> |