summaryrefslogtreecommitdiff
path: root/gst
diff options
context:
space:
mode:
authorVíctor Manuel Jáquez Leal <victorx.jaquez@intel.com>2015-10-14 20:22:43 +0200
committerVíctor Manuel Jáquez Leal <victorx.jaquez@intel.com>2015-10-20 12:32:44 +0200
commit45487fe87cc4dcc0c319701af0516ef6973794ec (patch)
tree90b15892d184f914373db1a1de4df087b4d7e924 /gst
parent3a2430c78902181325632919c3bc383d44c40048 (diff)
downloadgst-vaapi-45487fe87cc4dcc0c319701af0516ef6973794ec.tar.gz
vaapidecode: set format before decide allocation
There is a regression from commit 3d8e5e. It was expected the buffer pool allocation occur before the caps negotiation, but it is not. This patch fixes this regression: the caps negotiation is done regardless the allocation query from downstream. Signed-off-by: Víctor Manuel Jáquez Leal <victorx.jaquez@intel.com> https://bugzilla.gnome.org/show_bug.cgi?id=756686
Diffstat (limited to 'gst')
-rw-r--r--gst/vaapi/gstvaapidecode.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/gst/vaapi/gstvaapidecode.c b/gst/vaapi/gstvaapidecode.c
index 2dc7c6ca..28302777 100644
--- a/gst/vaapi/gstvaapidecode.c
+++ b/gst/vaapi/gstvaapidecode.c
@@ -213,12 +213,9 @@ gst_vaapidecode_update_src_caps (GstVaapiDecode * decode)
switch (feature) {
#if (USE_GLX || USE_EGL)
case GST_VAAPI_CAPS_FEATURE_GL_TEXTURE_UPLOAD_META:
- if (decode->has_texture_upload_meta)
features =
gst_caps_features_new
(GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META, NULL);
- else
- format = GST_VIDEO_FORMAT_I420;
break;
#endif
#if GST_CHECK_VERSION(1,5,0)