summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2018-10-04 11:36:09 +0300
committerSebastian Dröge <sebastian@centricular.com>2018-10-04 11:36:36 +0300
commitd09eccc06bcbc33fc8fe4ca20759b8c48d8fafb8 (patch)
tree65d52018e653e3ba655111451fea9974f930c494
parentd9992ba1b7a2b1409d24e7bbc20641935414491a (diff)
downloadgst-plugins-base-d09eccc06bcbc33fc8fe4ca20759b8c48d8fafb8.tar.gz
gst-plugins-base-d09eccc06bcbc33fc8fe4ca20759b8c48d8fafb8.tar.xz
video-overlay-composition: Correctly mark GstVideoOverlayFormatFlags as flags
And register a GType for it.
-rw-r--r--gst-libs/gst/video/Makefile.am3
-rw-r--r--gst-libs/gst/video/meson.build1
-rw-r--r--gst-libs/gst/video/video-overlay-composition.h4
3 files changed, 5 insertions, 3 deletions
diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
index 2170a0457..0f8473d95 100644
--- a/gst-libs/gst/video/Makefile.am
+++ b/gst-libs/gst/video/Makefile.am
@@ -4,7 +4,8 @@ include $(top_srcdir)/common/orc.mak
glib_enum_headers = video.h video-format.h video-color.h video-info.h video-dither.h \
colorbalance.h navigation.h video-chroma.h video-tile.h video-converter.h \
- video-resampler.h video-frame.h video-scaler.h video-anc.h
+ video-resampler.h video-frame.h video-scaler.h video-anc.h \
+ video-overlay-composition.h
glib_enum_define = GST_VIDEO
glib_gen_prefix = gst_video
glib_gen_basename = video
diff --git a/gst-libs/gst/video/meson.build b/gst-libs/gst/video/meson.build
index c0b68d383..356a34525 100644
--- a/gst-libs/gst/video/meson.build
+++ b/gst-libs/gst/video/meson.build
@@ -80,6 +80,7 @@ video_mkenum_headers = [
'video-converter.h',
'video-dither.h',
'video-info.h',
+ 'video-overlay-composition.h',
'video-resampler.h',
'video-scaler.h',
'video-tile.h',
diff --git a/gst-libs/gst/video/video-overlay-composition.h b/gst-libs/gst/video/video-overlay-composition.h
index 5c9bf24fe..766eedbbe 100644
--- a/gst-libs/gst/video/video-overlay-composition.h
+++ b/gst-libs/gst/video/video-overlay-composition.h
@@ -87,8 +87,8 @@ gst_video_overlay_rectangle_unref (GstVideoOverlayRectangle * comp)
*/
typedef enum {
GST_VIDEO_OVERLAY_FORMAT_FLAG_NONE = 0,
- GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA = 1,
- GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA = 2
+ GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA = (1<<0),
+ GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA = (1<<1)
} GstVideoOverlayFormatFlags;
#define GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION "meta:GstVideoOverlayComposition"