diff options
| author | Thibault Saunier <tsaunier@gnome.org> | 2014-06-20 11:10:45 +0200 |
|---|---|---|
| committer | Thibault Saunier <tsaunier@gnome.org> | 2014-06-20 19:53:33 +0200 |
| commit | d516c951e72024fddd4603c5264f6c3bf832bda7 (patch) | |
| tree | baacaaca2d094bf905a17c037f434e4b010a5049 /ext | |
| parent | 11fa711c34028b816702a748456f97de326b1e91 (diff) | |
| download | gstreamer-plugins-bad-d516c951e72024fddd4603c5264f6c3bf832bda7.tar.gz | |
gl:glvideomixer: Add the Compositor in the element metadata class
So it is possible to pick one compositing element from the registry
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/gl/gstglvideomixer.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ext/gl/gstglvideomixer.c b/ext/gl/gstglvideomixer.c index b2ff4008f..5a5d7a231 100644 --- a/ext/gl/gstglvideomixer.c +++ b/ext/gl/gstglvideomixer.c @@ -257,7 +257,7 @@ gst_gl_video_mixer_class_init (GstGLVideoMixerClass * klass) gobject_class->get_property = gst_gl_video_mixer_get_property; gst_element_class_set_metadata (element_class, "OpenGL video_mixer", - "Filter/Effect/Video", "OpenGL video_mixer", + "Filter/Effect/Video/Compositor", "OpenGL video_mixer", "Julien Isorce <julien.isorce@gmail.com>"); GST_GL_MIXER_CLASS (klass)->set_caps = gst_gl_video_mixer_init_shader; @@ -401,10 +401,8 @@ gst_gl_video_mixer_callback (gpointer stuff) continue; } pad = (GstGLVideoMixerPad *) frame->pad; - in_width = - GST_VIDEO_INFO_WIDTH (&GST_VIDEO_AGGREGATOR_PAD (pad)->info); - in_height = - GST_VIDEO_INFO_HEIGHT (&GST_VIDEO_AGGREGATOR_PAD (pad)->info); + in_width = GST_VIDEO_INFO_WIDTH (&GST_VIDEO_AGGREGATOR_PAD (pad)->info); + in_height = GST_VIDEO_INFO_HEIGHT (&GST_VIDEO_AGGREGATOR_PAD (pad)->info); if (!frame->texture || in_width <= 0 || in_height <= 0) { GST_DEBUG ("skipping texture:%u frame:%p width:%u height %u", |