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:
authorDalai Felinto <dalai@blender.org>2020-03-19 11:33:03 +0300
committerDalai Felinto <dalai@blender.org>2020-03-19 11:33:58 +0300
commit2d1cce8331f3ecdfb8cb0c651e111ffac5dc7153 (patch)
treeec50d7bdca3901a6afcc986943011f08f9516307 /source/blender/io/avi/intern
parent008aaaa37841ca27d2bba80d8859336655cef455 (diff)
Cleanup: `make format` after SortedIncludes change
Diffstat (limited to 'source/blender/io/avi/intern')
-rw-r--r--source/blender/io/avi/intern/avi.c8
-rw-r--r--source/blender/io/avi/intern/avi_codecs.c2
-rw-r--r--source/blender/io/avi/intern/avi_endian.c2
-rw-r--r--source/blender/io/avi/intern/avi_mjpeg.c2
-rw-r--r--source/blender/io/avi/intern/avi_options.c4
5 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/io/avi/intern/avi.c b/source/blender/io/avi/intern/avi.c
index 0901d03a90f..e829a15deba 100644
--- a/source/blender/io/avi/intern/avi.c
+++ b/source/blender/io/avi/intern/avi.c
@@ -23,11 +23,11 @@
* This is external code.
*/
-#include <stdlib.h>
-#include <string.h>
+#include <ctype.h>
#include <stdarg.h>
#include <stdio.h>
-#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
#ifdef WIN32
# include "BLI_winstuff.h"
@@ -35,9 +35,9 @@
#include "MEM_guardedalloc.h"
+#include "BLI_fileops.h"
#include "BLI_sys_types.h"
#include "BLI_utildefines.h"
-#include "BLI_fileops.h"
#include "AVI_avi.h"
#include "avi_intern.h"
diff --git a/source/blender/io/avi/intern/avi_codecs.c b/source/blender/io/avi/intern/avi_codecs.c
index 15f498ac653..fae8285aff5 100644
--- a/source/blender/io/avi/intern/avi_codecs.c
+++ b/source/blender/io/avi/intern/avi_codecs.c
@@ -26,8 +26,8 @@
#include "AVI_avi.h"
#include "avi_intern.h"
-#include "avi_rgb.h"
#include "avi_mjpeg.h"
+#include "avi_rgb.h"
#include "avi_rgb32.h"
void *avi_format_convert(
diff --git a/source/blender/io/avi/intern/avi_endian.c b/source/blender/io/avi/intern/avi_endian.c
index 56474e9e329..146206cd917 100644
--- a/source/blender/io/avi/intern/avi_endian.c
+++ b/source/blender/io/avi/intern/avi_endian.c
@@ -24,9 +24,9 @@
* endianness of the system.
*/
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <stdio.h>
#include "AVI_avi.h"
#include "avi_endian.h"
diff --git a/source/blender/io/avi/intern/avi_mjpeg.c b/source/blender/io/avi/intern/avi_mjpeg.c
index d4c7378964e..ac622d8b0e4 100644
--- a/source/blender/io/avi/intern/avi_mjpeg.c
+++ b/source/blender/io/avi/intern/avi_mjpeg.c
@@ -32,8 +32,8 @@
#include "IMB_imbuf.h"
-#include "jpeglib.h"
#include "jerror.h"
+#include "jpeglib.h"
#include "avi_mjpeg.h"
diff --git a/source/blender/io/avi/intern/avi_options.c b/source/blender/io/avi/intern/avi_options.c
index b078eccf376..65c64951ca0 100644
--- a/source/blender/io/avi/intern/avi_options.c
+++ b/source/blender/io/avi/intern/avi_options.c
@@ -25,9 +25,9 @@
*/
#include "AVI_avi.h"
-#include "avi_intern.h"
-#include "avi_endian.h"
#include "BLI_fileops.h"
+#include "avi_endian.h"
+#include "avi_intern.h"
#ifdef WIN32
# include "BLI_winstuff.h"