gcc/g++ 4.x fix

[melted] / src / framework / mlt_types.h

diff --git a/src/framework/mlt_types.h b/src/framework/mlt_types.h
index c5a8e68..f710055 100644 (file)
--- a/src/framework/mlt_types.h
+++ b/src/framework/mlt_types.h
@@ -21,6 +21,10 @@
 #ifndef _MLT_TYPES_H_
 #define _MLT_TYPES_H_
 
+#ifndef GCC_VERSION
+#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+#endif
+
 #include <stdint.h>
 
 #include "mlt_pool.h"
@@ -31,7 +35,8 @@ typedef enum
        mlt_image_rgb24,
        mlt_image_rgb24a,
        mlt_image_yuv422,
-       mlt_image_yuv420p
+       mlt_image_yuv420p,
+       mlt_image_opengl
 }
 mlt_image_format;
 
@@ -65,7 +70,14 @@ typedef enum
 }
 mlt_service_type;
 
+/* I don't want to break anyone's applications without warning. -Zach */
+#undef DOUBLE_MLT_POSITION
+#ifdef DOUBLE_MLT_POSITION
+typedef double mlt_position;
+#else
 typedef int32_t mlt_position;
+#endif
+
 typedef struct mlt_frame_s *mlt_frame, **mlt_frame_ptr;
 typedef struct mlt_properties_s *mlt_properties;
 typedef struct mlt_event_struct *mlt_event;