Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/imbuf/intern/util.c')
-rw-r--r--source/blender/imbuf/intern/util.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c
index 38591adbaa2..3c08955e2b3 100644
--- a/source/blender/imbuf/intern/util.c
+++ b/source/blender/imbuf/intern/util.c
@@ -41,7 +41,6 @@
#include "BLI_utildefines.h"
#include "BLI_path_util.h"
#include "BLI_fileops.h"
-#include "BLI_string.h"
#include "imbuf.h"
#include "IMB_imbuf_types.h"
@@ -51,14 +50,16 @@
#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>
-#include <libavutil/log.h>
+# include "BLI_string.h" /* BLI_vsnprintf */
-#include "ffmpeg_compat.h"
+# include "BKE_global.h" /* G.debug */
+# include <libavcodec/avcodec.h>
+# include <libavformat/avformat.h>
+# include <libavdevice/avdevice.h>
+# include <libavutil/log.h>
+
+# include "ffmpeg_compat.h"
#endif
#define UTIL_DEBUG 0