videoaggregator: repect the result of find_best_format in the default update_caps

We weren't using the result of find_best_format at all.

Also, move the find_best_format usage to the default update_caps() to make
sure that it is also overridable.

https://bugzilla.gnome.org/show_bug.cgi?id=764363
This commit is contained in:
Matthew Waters 2016-04-04 20:55:51 +10:00 committed by Tim-Philipp Müller
parent aae649dc75
commit 7f8e09523f

View file

@ -977,14 +977,10 @@ _update_caps (GstVideoAggregator * vagg, GstCaps * caps, GstCaps * filter)
{ {
GstCaps *ret; GstCaps *ret;
ret =
GST_VIDEO_AGGREGATOR_CLASS (gst_gl_video_mixer_parent_class)->update_caps
(vagg, caps, NULL);
if (filter) { if (filter) {
GstCaps *tmp = gst_caps_intersect (ret, filter); ret = gst_caps_intersect (caps, filter);
gst_caps_unref (ret); } else {
ret = tmp; ret = gst_caps_ref (caps);
} }
return ret; return ret;