From 4dffc12d6b11d3c1a8b7d26afc5a1aeb6600035d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
 <victorx.jaquez@intel.com>
Date: Fri, 11 Nov 2016 19:45:45 +0100
Subject: [PATCH] vaapivideomemory: rename video for allocation_info

Since video_info stores the GstVideoInfo of the allocation caps,
it is clear if we rename it as allocation_info, to distinguish it
later from negotiation_info.
---
 gst/vaapi/gstvaapivideomemory.c | 6 +++---
 gst/vaapi/gstvaapivideomemory.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gst/vaapi/gstvaapivideomemory.c b/gst/vaapi/gstvaapivideomemory.c
index b3695adab2..613441fac8 100644
--- a/gst/vaapi/gstvaapivideomemory.c
+++ b/gst/vaapi/gstvaapivideomemory.c
@@ -729,7 +729,7 @@ allocator_configure_surface_info (GstVaapiDisplay * display,
   gboolean updated, has_direct_uploading, has_direct_rendering;
   GstVideoFormat fmt;
 
-  vinfo = &allocator->video_info;
+  vinfo = &allocator->allocation_info;
   allocator->usage_flag = GST_VAAPI_IMAGE_USAGE_FLAG_NATIVE_FORMATS;
 
   fmt = gst_vaapi_video_format_get_best_native (GST_VIDEO_INFO_FORMAT (vinfo));
@@ -806,7 +806,7 @@ allocator_configure_image_info (GstVaapiDisplay * display,
     return;
   }
 
-  vinfo = &allocator->video_info;
+  vinfo = &allocator->allocation_info;
   allocator->image_info = *vinfo;
   gst_video_info_force_nv12_if_encoded (&allocator->image_info);
 
@@ -838,7 +838,7 @@ gst_vaapi_video_allocator_new (GstVaapiDisplay * display,
   if (!allocator)
     return NULL;
 
-  allocator->video_info = *vip;
+  allocator->allocation_info = *vip;
 
   allocator_configure_surface_info (display, allocator, req_usage_flag);
   allocator->surface_pool = gst_vaapi_surface_pool_new_full (display,
diff --git a/gst/vaapi/gstvaapivideomemory.h b/gst/vaapi/gstvaapivideomemory.h
index 4641f193f4..761ad1ce58 100644
--- a/gst/vaapi/gstvaapivideomemory.h
+++ b/gst/vaapi/gstvaapivideomemory.h
@@ -181,7 +181,7 @@ struct _GstVaapiVideoAllocator
   GstAllocator parent_instance;
 
   /*< private >*/
-  GstVideoInfo video_info;
+  GstVideoInfo allocation_info;
   GstVideoInfo surface_info;
   GstVaapiVideoPool *surface_pool;
   GstVideoInfo image_info;