diff --git a/gst/vaapi/gstvaapidecode.c b/gst/vaapi/gstvaapidecode.c
index 28302777b1..9835fbeed3 100644
--- a/gst/vaapi/gstvaapidecode.c
+++ b/gst/vaapi/gstvaapidecode.c
@@ -576,20 +576,15 @@ gst_vaapidecode_decide_allocation (GstVideoDecoder * vdec, GstQuery * query)
   GstVaapiDecode *const decode = GST_VAAPIDECODE (vdec);
   GstCaps *caps = NULL;
   GstVideoCodecState *state;
-  GstVaapiCapsFeature feature;
-  GstVideoFormat out_format;
 
   gst_query_parse_allocation (query, &caps, NULL);
-
-  feature =
-      gst_vaapi_find_preferred_caps_feature (GST_VIDEO_DECODER_SRC_PAD (vdec),
-      GST_VIDEO_FORMAT_ENCODED, &out_format);
   decode->has_texture_upload_meta = FALSE;
 #if (USE_GLX || USE_EGL)
   decode->has_texture_upload_meta =
-      (feature == GST_VAAPI_CAPS_FEATURE_GL_TEXTURE_UPLOAD_META) &&
       gst_query_find_allocation_meta (query,
-      GST_VIDEO_GL_TEXTURE_UPLOAD_META_API_TYPE, NULL);
+          GST_VIDEO_GL_TEXTURE_UPLOAD_META_API_TYPE, NULL) &&
+      gst_vaapi_caps_feature_contains (caps,
+          GST_VAAPI_CAPS_FEATURE_GL_TEXTURE_UPLOAD_META);
 #endif
 
   /* Update src caps if feature is not handled downstream */
@@ -599,7 +594,7 @@ gst_vaapidecode_decide_allocation (GstVideoDecoder * vdec, GstQuery * query)
   gst_video_codec_state_unref (state);
 
   return gst_vaapi_plugin_base_decide_allocation (GST_VAAPI_PLUGIN_BASE (vdec),
-      query, feature);
+      query, 0);
 }
 
 static inline gboolean
diff --git a/gst/vaapi/gstvaapipluginutil.c b/gst/vaapi/gstvaapipluginutil.c
index 997e8e0ca6..2071adc215 100644
--- a/gst/vaapi/gstvaapipluginutil.c
+++ b/gst/vaapi/gstvaapipluginutil.c
@@ -590,32 +590,44 @@ gst_caps_set_interlaced (GstCaps * caps, GstVideoInfo * vip)
   return TRUE;
 }
 
+static gboolean
+_gst_caps_has_feature (const GstCaps * caps, const gchar * feature)
+{
+  guint i;
+
+  for (i = 0; i < gst_caps_get_size (caps); i++) {
+    GstCapsFeatures *const features = gst_caps_get_features (caps, i);
+    /* Skip ANY features, we need an exact match for correct evaluation */
+    if (gst_caps_features_is_any (features))
+      continue;
+    if (gst_caps_features_contains (features, feature))
+      return TRUE;
+  }
+
+  return FALSE;
+}
+
+gboolean
+gst_vaapi_caps_feature_contains (const GstCaps * caps, GstVaapiCapsFeature feature)
+{
+  const gchar *feature_str;
+
+  g_return_val_if_fail (caps != NULL, FALSE);
+
+  feature_str = gst_vaapi_caps_feature_to_string (feature);
+  if (!feature_str)
+    return FALSE;
+
+  return _gst_caps_has_feature (caps, feature_str);
+}
+
 /* Checks whether the supplied caps contain VA surfaces */
 gboolean
 gst_caps_has_vaapi_surface (GstCaps * caps)
 {
-  gboolean found_caps = FALSE;
-  guint i, num_structures;
-
   g_return_val_if_fail (caps != NULL, FALSE);
 
-  num_structures = gst_caps_get_size (caps);
-  if (num_structures < 1)
-    return FALSE;
-
-  for (i = 0; i < num_structures && !found_caps; i++) {
-    GstCapsFeatures *const features = gst_caps_get_features (caps, i);
-
-#if GST_CHECK_VERSION(1,3,0)
-    /* Skip ANY features, we need an exact match for correct evaluation */
-    if (gst_caps_features_is_any (features))
-      continue;
-#endif
-
-    found_caps = gst_caps_features_contains (features,
-        GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE);
-  }
-  return found_caps;
+  return _gst_caps_has_feature (caps, GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE);
 }
 
 void
diff --git a/gst/vaapi/gstvaapipluginutil.h b/gst/vaapi/gstvaapipluginutil.h
index 94050fb04a..4ca82253ea 100644
--- a/gst/vaapi/gstvaapipluginutil.h
+++ b/gst/vaapi/gstvaapipluginutil.h
@@ -91,6 +91,11 @@ G_GNUC_INTERNAL
 const gchar *
 gst_vaapi_caps_feature_to_string (GstVaapiCapsFeature feature);
 
+G_GNUC_INTERNAL
+gboolean
+gst_vaapi_caps_feature_contains (const GstCaps * caps,
+    GstVaapiCapsFeature feature);
+
 /* Helpers to handle interlaced contents */
 # define GST_CAPS_INTERLACED_MODES \
     "interlace-mode = (string){ progressive, interleaved, mixed }"