From 76e9755eb71c500ba6a69c97c959f118873e5389 Mon Sep 17 00:00:00 2001
From: John Stebbins <jstebbins.hb@gmail.com>
Date: Wed, 17 Apr 2019 10:33:04 -0600
Subject: qsv: use HB_PROJECT_FEATURE_QSV instead of USE_QSV

---
 test/module.defs |  1 -
 test/test.c      | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'test')

diff --git a/test/module.defs b/test/module.defs
index c477ad1ef..6ac0159a5 100644
--- a/test/module.defs
+++ b/test/module.defs
@@ -24,7 +24,6 @@ ifeq (,$(filter $(HOST.system),darwin cygwin mingw))
 endif
 
 ifeq (1,$(FEATURE.qsv))
-    TEST.GCC.D += USE_QSV HAVE_THREADS=1
     TEST.GCC.l += mfx
 ifeq ($(HOST.system),linux)
     TEST.GCC.l += va va-drm
diff --git a/test/test.c b/test/test.c
index 75e938178..7d94ed2be 100644
--- a/test/test.c
+++ b/test/test.c
@@ -34,7 +34,7 @@
 #include "lang.h"
 #include "parsecsv.h"
 
-#ifdef USE_QSV
+#if HB_PROJECT_FEATURE_QSV
 #include "qsv_common.h"
 #endif
 
@@ -190,7 +190,7 @@ static int      start_at_frame = 0;
 static int64_t  stop_at_pts    = 0;
 static int      stop_at_frame = 0;
 static uint64_t min_title_duration = 10;
-#ifdef USE_QSV
+#if HB_PROJECT_FEATURE_QSV
 static int      qsv_async_depth    = -1;
 static int      qsv_decode         = -1;
 #endif
@@ -1901,7 +1901,7 @@ static void ShowHelp()
 "\n"
     );
 
-#ifdef USE_QSV
+#if HB_PROJECT_FEATURE_QSV
 if (hb_qsv_available())
 {
     fprintf( out,
@@ -2163,7 +2163,7 @@ static int ParseOptions( int argc, char ** argv )
             { "verbose",     optional_argument, NULL,    'v' },
             { "no-dvdnav",   no_argument,       NULL,    DVDNAV },
 
-#ifdef USE_QSV
+#if HB_PROJECT_FEATURE_QSV
             { "qsv-baseline",         no_argument,       NULL,        QSV_BASELINE,       },
             { "qsv-async-depth",      required_argument, NULL,        QSV_ASYNC_DEPTH,    },
             { "qsv-implementation",   required_argument, NULL,        QSV_IMPLEMENTATION, },
@@ -3053,7 +3053,7 @@ static int ParseOptions( int argc, char ** argv )
             case MIN_DURATION:
                 min_title_duration = strtol( optarg, NULL, 0 );
                 break;
-#ifdef USE_QSV
+#if HB_PROJECT_FEATURE_QSV
             case QSV_BASELINE:
                 hb_qsv_force_workarounds();
                 break;
@@ -4122,7 +4122,7 @@ static hb_dict_t * PreparePreset(const char *preset_name)
         hb_dict_set(preset, "VideoColorMatrixCodeOverride",
                     hb_value_int(color_matrix_code));
     }
-#ifdef USE_QSV
+#if HB_PROJECT_FEATURE_QSV
     if (qsv_async_depth >= 0)
     {
         hb_dict_set(preset, "VideoQSVAsyncDepth",
-- 
cgit v1.2.3