From bb22317e3939a78e7d2de3d716f2d6954fe22137 Mon Sep 17 00:00:00 2001
From: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
Date: Fri, 4 Nov 2011 20:07:52 -0400
Subject: [PATCH] vaapiplugin: allocate GLX buffers when supported.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
---
 gst/vaapi/gstvaapiconvert.c | 8 ++++++++
 gst/vaapi/gstvaapidecode.c  | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/gst/vaapi/gstvaapiconvert.c b/gst/vaapi/gstvaapiconvert.c
index 1574de78fe..043a6ba782 100644
--- a/gst/vaapi/gstvaapiconvert.c
+++ b/gst/vaapi/gstvaapiconvert.c
@@ -36,6 +36,14 @@
 #include <gst/vaapi/gstvaapivideosink.h>
 #include <gst/vaapi/gstvaapivideobuffer.h>
 
+#if USE_VAAPI_GLX
+#include <gst/vaapi/gstvaapivideobuffer_glx.h>
+#define gst_vaapi_video_buffer_new_from_pool(pool) \
+    gst_vaapi_video_buffer_glx_new_from_pool(pool)
+#define gst_vaapi_video_buffer_new_from_buffer(buffer) \
+    gst_vaapi_video_buffer_glx_new_from_buffer(buffer)
+#endif
+
 #include "gstvaapipluginutil.h"
 #include "gstvaapiconvert.h"
 
diff --git a/gst/vaapi/gstvaapidecode.c b/gst/vaapi/gstvaapidecode.c
index f267d0ff48..dff200bd7a 100644
--- a/gst/vaapi/gstvaapidecode.c
+++ b/gst/vaapi/gstvaapidecode.c
@@ -36,6 +36,12 @@
 #include <gst/vaapi/gstvaapidecoder_ffmpeg.h>
 #include <gst/video/videocontext.h>
 
+#if USE_VAAPI_GLX
+#include <gst/vaapi/gstvaapivideobuffer_glx.h>
+#define gst_vaapi_video_buffer_new(display) \
+    gst_vaapi_video_buffer_glx_new(GST_VAAPI_DISPLAY_GLX(display))
+#endif
+
 #include "gstvaapidecode.h"
 #include "gstvaapipluginutil.h"