diff options
| author | Julian Eisel <julian@blender.org> | 2020-03-26 23:03:42 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-03-26 23:18:45 +0300 |
| commit | c94b6209861ca7cc3985b53474feed7d94c0221a (patch) | |
| tree | 752054f0dca1338cda5cf8ad4f6d18573fcca3b9 /source/blender/imbuf/intern/anim_movie.c | |
| parent | 357ed79cb93f9d655501a828c6cddd68282de62d (diff) | |
| parent | afb1a64ccb81b7ed792f64151986f40f53af8da5 (diff) | |
Merge branch 'master' into wm-drag-drop-rewrite
Diffstat (limited to 'source/blender/imbuf/intern/anim_movie.c')
| -rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index 232a9998ebf..e9ac40de442 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -22,12 +22,7 @@ */ #ifdef _WIN32 -# define INC_OLE2 -# include <windows.h> -# include <windowsx.h> -# include <mmsystem.h> -# include <memory.h> -# include <commdlg.h> +# include "BLI_winstuff.h" # include <vfw.h> # undef AVIIF_KEYFRAME /* redefined in AVI_avi.h */ @@ -46,21 +41,21 @@ #endif -#include <sys/types.h> #include <ctype.h> -#include <stdlib.h> -#include <stdio.h> -#include <math.h> #include <limits.h> +#include <math.h> +#include <stdio.h> +#include <stdlib.h> +#include <sys/types.h> #ifndef _WIN32 # include <dirent.h> #else # include <io.h> #endif -#include "BLI_utildefines.h" -#include "BLI_string.h" #include "BLI_path_util.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "MEM_guardedalloc.h" @@ -68,8 +63,8 @@ # include "AVI_avi.h" #endif -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" @@ -81,8 +76,8 @@ #ifdef WITH_FFMPEG # include "BKE_global.h" /* ENDIAN_ORDER */ -# include <libavformat/avformat.h> # include <libavcodec/avcodec.h> +# include <libavformat/avformat.h> # include <libavutil/rational.h> # include <libswscale/swscale.h> |