summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Crete <olivier.crete@collabora.com>2015-06-17 09:53:29 +0300
committerSreerenj Balachandran <sreerenj.balachandran@intel.com>2015-06-17 09:53:29 +0300
commit3241296f67be75a100a7926eee5a7918dd66dc08 (patch)
tree1c3be000871a577642c528fefeee94f4222e5991
parentcbc2d15becc33718085c6663f300e5a4cd2b1b18 (diff)
downloadgst-vaapi-3241296f67be75a100a7926eee5a7918dd66dc08.tar.gz
vaapipluginbase: Override downstream allocation reply if no pool
If the downstream replied without a pool, then override it. https://bugzilla.gnome.org/show_bug.cgi?id=748559
-rw-r--r--gst/vaapi/gstvaapipluginbase.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/gst/vaapi/gstvaapipluginbase.c b/gst/vaapi/gstvaapipluginbase.c
index e4f1c586..6624316b 100644
--- a/gst/vaapi/gstvaapipluginbase.c
+++ b/gst/vaapi/gstvaapipluginbase.c
@@ -687,10 +687,9 @@ gst_vaapi_plugin_base_decide_allocation (GstVaapiPluginBase * plugin,
if (gst_query_get_n_allocation_pools (query) > 0) {
gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
- update_pool = (pool != NULL);
+ update_pool = TRUE;
+ size = MAX (size, vi.size);
if (pool) {
- size = MAX (size, vi.size);
-
/* Check whether downstream element proposed a bufferpool but did
not provide a correct propose_allocation() implementation */
has_video_alignment = gst_buffer_pool_has_option (pool,