rename avi files (endian.h is common linux include).

13 files changed, 58 insertions, 50 deletions

diff --git a/source/blender/avi/AVI_avi.h b/source/blender/avi/AVI_avi.h
index bdfdbc117ed..4dc52970119 100644
--- a/source/blender/avi/AVI_avi.h
+++ b/source/blender/avi/AVI_avi.h
@@ -178,7 +178,7 @@ typedef struct _AviStreamRec {
 } AviStreamRec;
 
 typedef struct _AviMovie {
-	FILE *fp; 
+	FILE *fp;
 	
 	int type;
 #define AVI_MOVIE_READ  0
diff --git a/source/blender/avi/CMakeLists.txt b/source/blender/avi/CMakeLists.txt
index 79422dff917..292206d8cb9 100644
--- a/source/blender/avi/CMakeLists.txt
+++ b/source/blender/avi/CMakeLists.txt
@@ -35,19 +35,19 @@ set(INC_SYS
 
 set(SRC
 	intern/avi.c
-	intern/avirgb.c
-	intern/codecs.c
-	intern/endian.c
-	intern/mjpeg.c
-	intern/options.c
-	intern/rgb32.c
+	intern/avi_rgb.c
+	intern/avi_codecs.c
+	intern/avi_endian.c
+	intern/avi_mjpeg.c
+	intern/avi_options.c
+	intern/avi_rgb32.c
 
 	AVI_avi.h
 	intern/avi_intern.h
-	intern/avirgb.h
-	intern/endian.h
-	intern/mjpeg.h
-	intern/rgb32.h
+	intern/avi_rgb.h
+	intern/avi_endian.h
+	intern/avi_mjpeg.h
+	intern/avi_rgb32.h
 )
 
 blender_add_lib(bf_avi "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/avi/intern/avi.c b/source/blender/avi/intern/avi.c
index 2845b2f95c9..15d8702a5ec 100644
--- a/source/blender/avi/intern/avi.c
+++ b/source/blender/avi/intern/avi.c
@@ -32,7 +32,6 @@
  * This is external code.
  */
 
-
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
@@ -49,7 +48,7 @@
 #include "AVI_avi.h"
 #include "avi_intern.h"
 
-#include "endian.h"
+#include "avi_endian.h"
 
 static int AVI_DEBUG = 0;
 static char DEBUG_FCC[4];
diff --git a/source/blender/avi/intern/codecs.c b/source/blender/avi/intern/avi_codecs.c
index 01e228d570e..e43826064a6 100644
--- a/source/blender/avi/intern/codecs.c
+++ b/source/blender/avi/intern/avi_codecs.c
@@ -25,7 +25,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/avi/intern/codecs.c
+/** \file blender/avi/intern/avi_codecs.c
  *  \ingroup avi
  *
  * This is external code. Identify and convert different avi-files.
@@ -35,9 +35,9 @@
 #include "AVI_avi.h"
 #include "avi_intern.h"
 
-#include "avirgb.h"
-#include "mjpeg.h"
-#include "rgb32.h"
+#include "avi_rgb.h"
+#include "avi_mjpeg.h"
+#include "avi_rgb32.h"
 
 void *avi_format_convert(AviMovie *movie, int stream, void *buffer, AviFormat from, AviFormat to, int *size)
 {
diff --git a/source/blender/avi/intern/endian.c b/source/blender/avi/intern/avi_endian.c
index 8e5ed80f5a0..70add8bd90f 100644
--- a/source/blender/avi/intern/endian.c
+++ b/source/blender/avi/intern/avi_endian.c
@@ -26,7 +26,7 @@
  *
  */
 
-/** \file blender/avi/intern/endian.c
+/** \file blender/avi/intern/avi_endian.c
  *  \ingroup avi
  *
  * This is external code. Streams bytes to output depending on the
@@ -36,9 +36,10 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h> 
+#include <stdio.h>
+
 #include "AVI_avi.h"
-#include "endian.h"
+#include "avi_endian.h"
 #include "avi_intern.h"
 
 #ifdef __BIG_ENDIAN__
diff --git a/source/blender/avi/intern/endian.h b/source/blender/avi/intern/avi_endian.h
index 7ef49cb1699..8cea283a553 100644
--- a/source/blender/avi/intern/endian.h
+++ b/source/blender/avi/intern/avi_endian.h
@@ -25,17 +25,14 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/avi/intern/endian.h
+/** \file blender/avi/intern/avi_endian.h
  *  \ingroup avi
  *
  * This is external code.
  */
 
-#ifndef __ENDIAN_H__
-#define __ENDIAN_H__
-
-#include <stdio.h>
-#include "AVI_avi.h"
+#ifndef __AVI_ENDIAN_H__
+#define __AVI_ENDIAN_H__
 
 #define AVI_RAW      0
 #define AVI_CHUNK    1
@@ -48,5 +45,4 @@
 
 void awrite(AviMovie *movie, void *datain, int block, int size, FILE *fp, int type);
 
-#endif
-
+#endif  /* __AVI_ENDIAN_H__ */
diff --git a/source/blender/avi/intern/mjpeg.c b/source/blender/avi/intern/avi_mjpeg.c
index a700284bf68..b98e03d6a19 100644
--- a/source/blender/avi/intern/mjpeg.c
+++ b/source/blender/avi/intern/avi_mjpeg.c
@@ -26,21 +26,23 @@
  *
  */
 
-/** \file blender/avi/intern/mjpeg.c
+/** \file blender/avi/intern/avi_mjpeg.c
  *  \ingroup avi
  *
  * This is external code. Converts between avi and mpeg/jpeg.
  */
 
-
-#include "AVI_avi.h"
 #include <stdlib.h>
 #include <string.h>
+
+#include "AVI_avi.h"
+
+#include "MEM_guardedalloc.h"
+
 #include "jpeglib.h"
 #include "jerror.h"
-#include "MEM_guardedalloc.h"
 
-#include "mjpeg.h"
+#include "avi_mjpeg.h"
 
 #define PADUP(num, amt) ((num + (amt - 1)) & ~(amt - 1))
 
diff --git a/source/blender/avi/intern/mjpeg.h b/source/blender/avi/intern/avi_mjpeg.h
index 75649891f2b..6ae0e56ffa4 100644
--- a/source/blender/avi/intern/mjpeg.h
+++ b/source/blender/avi/intern/avi_mjpeg.h
@@ -25,11 +25,14 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/avi/intern/mjpeg.h
+/** \file blender/avi/intern/avi_mjpeg.h
  *  \ingroup avi
  */
 
+#ifndef __AVI_MJPEG_H__
+#define __AVI_MJPEG_H__
 
 void *avi_converter_from_mjpeg (AviMovie *movie, int stream, unsigned char *buffer, int *size);
 void *avi_converter_to_mjpeg (AviMovie *movie, int stream, unsigned char *buffer, int *size);
 
+#endif /* __AVI_MJPEG_H__ */
diff --git a/source/blender/avi/intern/options.c b/source/blender/avi/intern/avi_options.c
index 7de91318ecf..f7759a1099f 100644
--- a/source/blender/avi/intern/options.c
+++ b/source/blender/avi/intern/avi_options.c
@@ -26,7 +26,7 @@
  *
  */
 
-/** \file blender/avi/intern/options.c
+/** \file blender/avi/intern/avi_options.c
  *  \ingroup avi
  *
  * This is external code. Sets some compression related options
@@ -35,7 +35,7 @@
 
 #include "AVI_avi.h"
 #include "avi_intern.h"
-#include "endian.h"
+#include "avi_endian.h"
 
 #ifdef WIN32
 #  include "BLI_winstuff.h"
diff --git a/source/blender/avi/intern/avirgb.c b/source/blender/avi/intern/avi_rgb.c
index 7a95972845a..61587e15e61 100644
--- a/source/blender/avi/intern/avirgb.c
+++ b/source/blender/avi/intern/avi_rgb.c
@@ -26,19 +26,19 @@
  *
  */
 
-/** \file blender/avi/intern/avirgb.c
+/** \file blender/avi/intern/avi_rgb.c
  *  \ingroup avi
  *
  * This is external code. Converts rgb-type avi-s.
  */
 
-
-#include "AVI_avi.h"
 #include <stdlib.h>
 #include <string.h>
 
 #include "MEM_guardedalloc.h"
-#include "avirgb.h"
+
+#include "AVI_avi.h"
+#include "avi_rgb.h"
 
 /* implementation */
 
diff --git a/source/blender/avi/intern/avirgb.h b/source/blender/avi/intern/avi_rgb.h
index 20211d6ab2d..773166e9fab 100644
--- a/source/blender/avi/intern/avirgb.h
+++ b/source/blender/avi/intern/avi_rgb.h
@@ -25,11 +25,14 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/avi/intern/avirgb.h
+/** \file blender/avi/intern/avi_rgb.h
  *  \ingroup avi
  */
 
+#ifndef __AVI_RGB_H__
+#define __AVI_RGB_H__
 
-void *avi_converter_from_avi_rgb (AviMovie *movie, int stream, unsigned char *buffer, int *size);
-void *avi_converter_to_avi_rgb (AviMovie *movie, int stream, unsigned char *buffer, int *size);
+void *avi_converter_from_avi_rgb(AviMovie *movie, int stream, unsigned char *buffer, int *size);
+void *avi_converter_to_avi_rgb(AviMovie *movie, int stream, unsigned char *buffer, int *size);
 
+#endif /* __AVI_RGB_H__ */
diff --git a/source/blender/avi/intern/rgb32.c b/source/blender/avi/intern/avi_rgb32.c
index 84630f09fe5..5c7a4889d97 100644
--- a/source/blender/avi/intern/rgb32.c
+++ b/source/blender/avi/intern/avi_rgb32.c
@@ -26,18 +26,19 @@
  *
  */
 
-/** \file blender/avi/intern/rgb32.c
+/** \file blender/avi/intern/avi_rgb32.c
  *  \ingroup avi
  *
  * This is external code. Converts between rgb32 and avi.
  */
 
-
-#include "AVI_avi.h"
 #include <stdlib.h>
 #include <string.h>
+
 #include "MEM_guardedalloc.h"
-#include "rgb32.h"
+
+#include "AVI_avi.h"
+#include "avi_rgb32.h"
 
 void *avi_converter_from_rgb32(AviMovie *movie, int stream, unsigned char *buffer, int *size)
 {
diff --git a/source/blender/avi/intern/rgb32.h b/source/blender/avi/intern/avi_rgb32.h
index 55f9771a4df..523f9e795fd 100644
--- a/source/blender/avi/intern/rgb32.h
+++ b/source/blender/avi/intern/avi_rgb32.h
@@ -25,11 +25,14 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/avi/intern/rgb32.h
+/** \file blender/avi/intern/avi_rgb32.h
  *  \ingroup avi
  */
 
+#ifndef __AVI_RGB32_H__
+#define __AVI_RGB32_H__
 
-void *avi_converter_from_rgb32 (AviMovie *movie, int stream, unsigned char *buffer, int *size);
-void *avi_converter_to_rgb32 (AviMovie *movie, int stream, unsigned char *buffer, int *size);
+void *avi_converter_from_rgb32(AviMovie *movie, int stream, unsigned char *buffer, int *size);
+void *avi_converter_to_rgb32(AviMovie *movie, int stream, unsigned char *buffer, int *size);
 
+#endif /* __AVI_RGB32_H__ */