diff options
Diffstat (limited to 'gst/videomixer/videomixer2.c')
| -rw-r--r-- | gst/videomixer/videomixer2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gst/videomixer/videomixer2.c b/gst/videomixer/videomixer2.c index b97e0ad5..f87f4b76 100644 --- a/gst/videomixer/videomixer2.c +++ b/gst/videomixer/videomixer2.c @@ -1642,16 +1642,16 @@ gst_videomixer2_src_setcaps (GstPad * pad, GstVideoMixer2 * mix, GstCaps * caps) GST_INFO_OBJECT (pad, "set src caps: %" GST_PTR_FORMAT, caps); - mix->blend = NULL; - mix->overlay = NULL; - mix->fill_checker = NULL; - mix->fill_color = NULL; - if (!gst_video_info_from_caps (&info, caps)) goto done; GST_VIDEO_MIXER2_LOCK (mix); + mix->blend = NULL; + mix->overlay = NULL; + mix->fill_checker = NULL; + mix->fill_color = NULL; + if (GST_VIDEO_INFO_FPS_N (&mix->info) != GST_VIDEO_INFO_FPS_N (&info) || GST_VIDEO_INFO_FPS_D (&mix->info) != GST_VIDEO_INFO_FPS_D (&info)) { if (mix->segment.position != -1) { @@ -2290,7 +2290,7 @@ gst_videomixer2_class_init (GstVideoMixer2Class * klass) gst_static_pad_template_get (&sink_factory)); gst_element_class_set_static_metadata (gstelement_class, "Video mixer 2", - "Filter/Editor/Video", + "Filter/Editor/Video/Compositor", "Mix multiple video streams", "Wim Taymans <wim@fluendo.com>, " "Sebastian Dröge <sebastian.droege@collabora.co.uk>"); |