X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_types.h;h=f7100555d7b1fd54d6bafe9f8246830f73b26fab;hb=eabc3498604fc7983bbd805d40dad2e7df135f17;hp=605e51a0cd9b9bc4b014387191f63cafb2171fb8;hpb=f00476101550ec7d8e863f6516aa83bc1b524570;p=melted

diff --git a/src/framework/mlt_types.h b/src/framework/mlt_types.h
index 605e51a..f710055 100644
--- 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;
 
@@ -50,7 +55,7 @@ typedef enum
 }
 mlt_whence;
 
-typedef enum 
+typedef enum
 {
 	invalid_type,
 	unknown_type,
@@ -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;
@@ -80,6 +92,8 @@ typedef struct mlt_field_s *mlt_field;
 typedef struct mlt_consumer_s *mlt_consumer;
 typedef struct mlt_parser_s *mlt_parser;
 typedef struct mlt_deque_s *mlt_deque;
+typedef struct mlt_geometry_s *mlt_geometry;
+typedef struct mlt_geometry_item_s *mlt_geometry_item;
 
 typedef void ( *mlt_destructor )( void * );
 typedef char *( *mlt_serialiser )( void *, int length );