diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2014-08-14 16:36:44 +0300 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-08-14 16:36:44 +0300 |
| commit | ce1d4d9f21e0681f3c6025ffb27b1ae625329b11 (patch) | |
| tree | 589601efcb93f91be4c7e032b241623b348415f8 | |
| parent | 61fe02a0188f827c50b033078896928a3ec0bb81 (diff) | |
videomixer: Use the best width/height/etc if downstream can handle that
Before it was always using whatever downstream preferred, while
the code and documentation claimed something different.
https://bugzilla.gnome.org/show_bug.cgi?id=727180
| -rw-r--r-- | gst/videomixer/videomixer2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gst/videomixer/videomixer2.c b/gst/videomixer/videomixer2.c index 8556cdbc4..9bcbc75ef 100644 --- a/gst/videomixer/videomixer2.c +++ b/gst/videomixer/videomixer2.c @@ -248,7 +248,7 @@ gst_videomixer2_update_src_caps (GstVideoMixer2 * mix) caps = gst_video_info_to_caps (&info); peercaps = gst_pad_peer_query_caps (mix->srcpad, NULL); - if (peercaps) { + if (peercaps && !gst_caps_can_intersect (peercaps, caps)) { GstCaps *tmp; s = gst_caps_get_structure (caps, 0); |