From 9e961440e097cdc5a7c3a74c1837f9b29deaacd1 Mon Sep 17 00:00:00 2001
From: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
Date: Thu, 3 Aug 2017 17:12:18 -0700
Subject: FEI: Fix build issues when fei disabled

---
 configure.ac                              | 1 +
 gst-libs/gst/vaapi/gstvaapisurfaceproxy.c | 8 ++++----
 gst/vaapi/gstvaapiencode.c                | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index c8724417..67ecf98d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -727,6 +727,7 @@ USE_JPEG_ENCODER=0
 USE_VP8_ENCODER=0
 USE_H265_ENCODER=0
 USE_VP9_ENCODER=0
+USE_H264_FEI_ENCODER=0
 
 if test $USE_ENCODERS -eq 1; then
   saved_CPPFLAGS="$CPPFLAGS"
diff --git a/gst-libs/gst/vaapi/gstvaapisurfaceproxy.c b/gst-libs/gst/vaapi/gstvaapisurfaceproxy.c
index eb9a5aad..37f9ce65 100644
--- a/gst-libs/gst/vaapi/gstvaapisurfaceproxy.c
+++ b/gst-libs/gst/vaapi/gstvaapisurfaceproxy.c
@@ -51,7 +51,7 @@ gst_vaapi_surface_proxy_finalize (GstVaapiSurfaceProxy * proxy)
   if (proxy->destroy_func)
     proxy->destroy_func (proxy->destroy_data);
 
-#ifdef USE_H264_FEI_ENCODER
+#if USE_H264_FEI_ENCODER
   if (proxy->mvpred)
     gst_vaapi_fei_codec_object_replace ((GstVaapiFeiCodecObject **) &
         proxy->mvpred, NULL);
@@ -90,7 +90,7 @@ gst_vaapi_surface_proxy_init_properties (GstVaapiSurfaceProxy * proxy)
   proxy->timestamp = GST_CLOCK_TIME_NONE;
   proxy->duration = GST_CLOCK_TIME_NONE;
   proxy->has_crop_rect = FALSE;
-#ifdef USE_H264_FEI_ENCODER
+#if USE_H264_FEI_ENCODER
   proxy->mvpred = NULL;
   proxy->mbcntrl = NULL;
   proxy->qp = NULL;
@@ -219,7 +219,7 @@ gst_vaapi_surface_proxy_copy (GstVaapiSurfaceProxy * proxy)
   if (copy->has_crop_rect)
     copy->crop_rect = proxy->crop_rect;
 
-#ifdef USE_H264_FEI_ENCODER
+#if USE_H264_FEI_ENCODER
 
   if (proxy->mv)
     copy->mv = (GstVaapiEncFeiMv *)
@@ -478,7 +478,7 @@ gst_vaapi_surface_proxy_set_crop_rect (GstVaapiSurfaceProxy * proxy,
     proxy->crop_rect = *crop_rect;
 }
 
-#ifdef USE_H264_FEI_ENCODER
+#if USE_H264_FEI_ENCODER
 
 GstVaapiEncFeiMbCode *
 gst_vaapi_surface_proxy_get_fei_mb_code (GstVaapiSurfaceProxy * proxy)
diff --git a/gst/vaapi/gstvaapiencode.c b/gst/vaapi/gstvaapiencode.c
index 633ea6f8..b3988394 100644
--- a/gst/vaapi/gstvaapiencode.c
+++ b/gst/vaapi/gstvaapiencode.c
@@ -651,7 +651,7 @@ gst_vaapiencode_handle_frame (GstVideoEncoder * venc,
   if (!proxy)
     goto error_buffer_no_surface_proxy;
 
-#ifdef USE_H264_FEI_ENCODER
+#if USE_H264_FEI_ENCODER
   feimeta = gst_buffer_get_vaapi_fei_video_meta (buf);
   if (feimeta && klass->load_control_data)
     klass->load_control_data (encode, feimeta, proxy);
-- 
cgit v1.2.3