vaapivideobufferpool: reject configuration if allocator isn't vaapi

If the requested allocator in set_config() is not a VAAPI valid one,
reject the configuration, instead of lying and using a private one.

This patch superseeds !254 and !24

diff --git a/gst/vaapi/gstvaapivideobufferpool.c b/gst/vaapi/gstvaapivideobufferpool.c
index a331d4f..d99f306 100644 (file)
--- a/gst/vaapi/gstvaapivideobufferpool.c
+++ b/gst/vaapi/gstvaapivideobufferpool.c
@@ -166,14 +166,8 @@ gst_vaapi_video_buffer_pool_set_config (GstBufferPool * pool,
   if (allocator
       && (g_strcmp0 (allocator->mem_type, GST_VAAPI_VIDEO_MEMORY_NAME) != 0
           && g_strcmp0 (allocator->mem_type,
-              GST_VAAPI_DMABUF_ALLOCATOR_NAME) != 0)) {
-    /* if pool has already an allocator, try it and ignore the one in
-     * configuration */
-    if (priv->allocator)
-      allocator = priv->allocator;
-    else
-      allocator = NULL;
-  }
+              GST_VAAPI_DMABUF_ALLOCATOR_NAME) != 0))
+    goto error_invalid_allocator;
 
   /* get the allocator properties */
   if (allocator) {