summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiang, Haihao <haihao.xiang@intel.com>2015-05-26 09:49:25 +0800
committerXiang, Haihao <haihao.xiang@intel.com>2015-05-26 09:50:11 +0800
commitee0d5d72c45b6db1e06a101e66143cac829d2354 (patch)
tree3c5ca16dfd163d61a990c6506ec8f84ae2b1fb9c
parent1ef7a7b08245b0bddfe59829280b21fe88024dae (diff)
downloadlibva-ee0d5d72c45b6db1e06a101e66143cac829d2354.tar.gz
Fix the error instroduced in 1ef7a7b when resolving cherry-pick conflict
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
-rw-r--r--va/va_backend.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/va/va_backend.h b/va/va_backend.h
index 49c737c..14c0f42 100644
--- a/va/va_backend.h
+++ b/va/va_backend.h
@@ -530,13 +530,6 @@ struct VADriverContext
*/
struct VADriverVTableWayland *vtable_wayland;
- /**
- * \brief The VA/VPP implementation hooks.
- *
- * This structure is allocated from libva with calloc().
- */
- struct VADriverVTableVPP *vtable_vpp;
-
char *override_driver_name;
unsigned long reserved[41]; /* reserve for future add-ins, decrease the subscript accordingly */