1 files changed, 25 insertions, 22 deletions
diff --git a/source/blender/blenkernel/BKE_writeffmpeg.h b/source/blender/blenkernel/BKE_writeffmpeg.h
index 8a11d48d063..347c8b60532 100644
--- a/source/blender/blenkernel/BKE_writeffmpeg.h
+++ b/source/blender/blenkernel/BKE_writeffmpeg.h
@@ -38,31 +38,34 @@
 extern "C" {
 #endif
 
-#define FFMPEG_MPEG1    0
-#define FFMPEG_MPEG2    1
-#define FFMPEG_MPEG4    2
-#define FFMPEG_AVI  3
-#define FFMPEG_MOV  4
-#define FFMPEG_DV   5
-#define FFMPEG_H264     6
-#define FFMPEG_XVID     7
-#define FFMPEG_FLV      8
-#define FFMPEG_MKV      9
-#define FFMPEG_OGG      10
-#define FFMPEG_WAV      11
-#define FFMPEG_MP3      12
+enum {
+	FFMPEG_MPEG1    = 0,
+	FFMPEG_MPEG2    = 1,
+	FFMPEG_MPEG4    = 2,
+	FFMPEG_AVI      = 3,
+	FFMPEG_MOV      = 4,
+	FFMPEG_DV       = 5,
+	FFMPEG_H264     = 6,
+	FFMPEG_XVID     = 7,
+	FFMPEG_FLV      = 8,
+	FFMPEG_MKV      = 9,
+	FFMPEG_OGG      = 10,
+	FFMPEG_INVALID  = 11,
+};
 
-#define FFMPEG_PRESET_NONE      0
-#define FFMPEG_PRESET_DVD       1
-#define FFMPEG_PRESET_SVCD      2
-#define FFMPEG_PRESET_VCD       3
-#define FFMPEG_PRESET_DV        4
-#define FFMPEG_PRESET_H264      5
-#define FFMPEG_PRESET_THEORA    6
-#define FFMPEG_PRESET_XVID      7
+enum {
+	FFMPEG_PRESET_NONE      = 0,
+	FFMPEG_PRESET_DVD       = 1,
+	FFMPEG_PRESET_SVCD      = 2,
+	FFMPEG_PRESET_VCD       = 3,
+	FFMPEG_PRESET_DV        = 4,
+	FFMPEG_PRESET_H264      = 5,
+	FFMPEG_PRESET_THEORA    = 6,
+	FFMPEG_PRESET_XVID      = 7,
+};
 
 struct IDProperty;
-struct RenderData;	
+struct RenderData;
 struct ReportList;
 struct Scene;