Merge branch 'master' into 0.11

[platform/upstream/gst-plugins-good.git] / gst / flx / flx_color.h

diff --git a/gst/flx/flx_color.h b/gst/flx/flx_color.h
index d423ab8..80378e1 100644 (file)
--- a/gst/flx/flx_color.h
+++ b/gst/flx/flx_color.h
@@ -17,6 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __FLX_COLOR_H__
+#define __FLX_COLOR_H__
+
+#include <gst/gst.h>
+
+G_BEGIN_DECLS
+
 typedef enum {
   FLX_COLORSPACE_RGB8,
   FLX_COLORSPACE_RGB32,
@@ -31,7 +38,6 @@ struct _FlxColorSpaceConverter {
   guchar      palvec[768];
 };
 
-
 void flx_colorspace_converter_destroy(FlxColorSpaceConverter *flxpal);
 void flx_colorspace_convert(FlxColorSpaceConverter *flxpal, guchar *src, guchar *dest);
 FlxColorSpaceConverter * flx_colorspace_converter_new(gint width, gint height);
@@ -41,3 +47,6 @@ void flx_set_palette_vector(FlxColorSpaceConverter *flxpal, guint start, guint n
 void flx_set_color(FlxColorSpaceConverter *flxpal, guint colr, guint red, guint green,
           guint blue, gint scale);
 
+G_END_DECLS
+
+#endif /* __FLX_COLOR_H__ */