X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_types.h;h=f7100555d7b1fd54d6bafe9f8246830f73b26fab;hb=eabc3498604fc7983bbd805d40dad2e7df135f17;hp=c5a8e68feee1691634305df163b6337016041d1b;hpb=161d5c65021c21fff45ad6e8458bdee36c9d61a3;p=melted diff --git a/src/framework/mlt_types.h b/src/framework/mlt_types.h index c5a8e68..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 #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;