Merging r49499 through r49518 from trunk into soc-2011-tomato
[blender.git] / source / blender / makesdna / DNA_scene_types.h
index 3a598e4e11ae4d181b2925a8d7f10b2cb0f6d9c0..83050561cc4d03bc842e051745953f53486930ee 100644 (file)
@@ -292,7 +292,7 @@ typedef struct ImageFormatData {
 #define R_IMF_IMTYPE_AVIRAW         15
 #define R_IMF_IMTYPE_AVIJPEG        16
 #define R_IMF_IMTYPE_PNG            17
-#define R_IMF_IMTYPE_AVICODEC       18
+/* #define R_IMF_IMTYPE_AVICODEC    18 */ /* avicodec is nomore */
 #define R_IMF_IMTYPE_QUICKTIME      19
 #define R_IMF_IMTYPE_BMP            20
 #define R_IMF_IMTYPE_RADHDR         21