QSV: use ifdefs rather than filtering to bypass libmfx references during compilation without --enable-qsv.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5805 b64f7644-9d1e-0410-96f1-a4d463321fa5

6 files changed, 20 insertions, 5 deletions

diff --git a/libhb/enc_qsv.c b/libhb/enc_qsv.c
index 45fef910a..46a398c67 100644
--- a/libhb/enc_qsv.c
+++ b/libhb/enc_qsv.c
@@ -26,6 +26,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 \* ********************************************************************* */
 
+#ifdef USE_QSV
+
 #include "hb.h"
 #include "enc_qsv.h"
 #include "qsv_common.h"
@@ -1569,3 +1571,5 @@ void parse_nalus(uint8_t *nal_inits, size_t length, hb_buffer_t *buf, uint32_t f
             }
         }
 }
+
+#endif // USE_QSV
diff --git a/libhb/module.defs b/libhb/module.defs
index e06c6331b..009a2bdd9 100644
--- a/libhb/module.defs
+++ b/libhb/module.defs
@@ -13,12 +13,7 @@ LIBHB.build/ = $(BUILD/)libhb/
 LIBHB.m4.in  = $(wildcard $(LIBHB.src/)*.m4)
 LIBHB.m4.out = $(patsubst $(LIBHB.src/)%.m4,$(LIBHB.build/)%,$(LIBHB.m4.in))
 
-ifeq (1,$(FEATURE.qsv))
 LIBHB.c   = $(wildcard $(LIBHB.src/)*.c)
-else
-LIBHB.c   = $(filter-out $(wildcard $(LIBHB.src/)*qsv*.c), $(wildcard $(LIBHB.src/)*.c))
-endif
-
 LIBHB.c.o = $(patsubst $(SRC/)%.c,$(BUILD/)%.o,$(LIBHB.c))
 LIBHB.d   = $(LIBHB.m4.out) $(LIBHB.h.out) \
     $(foreach n,$(LIBHB.prerequisites),$($n.INSTALL.target) )
diff --git a/libhb/qsv_common.c b/libhb/qsv_common.c
index 1b989c572..cbd427f5d 100644
--- a/libhb/qsv_common.c
+++ b/libhb/qsv_common.c
@@ -7,6 +7,8 @@
  * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
+#ifdef USE_QSV
+
 #include "hb.h"
 #include "ports.h"
 #include "common.h"
@@ -846,3 +848,5 @@ const char* hb_qsv_impl_get_name(int impl)
             return NULL;
     }
 }
+
+#endif // USE_QSV
diff --git a/libhb/qsv_filter.c b/libhb/qsv_filter.c
index c2e328e48..5d572a311 100644
--- a/libhb/qsv_filter.c
+++ b/libhb/qsv_filter.c
@@ -26,6 +26,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 \* ********************************************************************* */
 
+#ifdef USE_QSV
+
 #include "hb.h"
 #include "hbffmpeg.h"
 #include "libavcodec/qsv.h"
@@ -678,3 +680,5 @@ hb_buffer_t *link_buf_list( hb_filter_private_t *pv )
     return head;
 }
 
+#endif // USE_QSV
+
diff --git a/libhb/qsv_filter_pp.c b/libhb/qsv_filter_pp.c
index ec625d664..c9323bff9 100644
--- a/libhb/qsv_filter_pp.c
+++ b/libhb/qsv_filter_pp.c
@@ -26,6 +26,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 \* ********************************************************************* */
 
+#ifdef USE_QSV
+
 #include "hb.h"
 #include "hbffmpeg.h"
 #include "libavcodec/qsv.h"
@@ -914,3 +916,5 @@ int process_filter(qsv_filter_task_t* task, void* params){
 
     return sts;
 }
+
+#endif // USE_QSV
diff --git a/libhb/qsv_memory.c b/libhb/qsv_memory.c
index f04c77a76..a01b502c8 100644
--- a/libhb/qsv_memory.c
+++ b/libhb/qsv_memory.c
@@ -26,6 +26,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 \* ********************************************************************* */
 
+#ifdef USE_QSV
+
 #include "hb.h"
 #include "hbffmpeg.h"
 #include "qsv_memory.h"
@@ -118,3 +120,5 @@ int qsv_yuv420_to_nv12(struct SwsContext* sws_context,mfxFrameSurface1* dst, hb_
 
     return ret;
 }
+
+#endif // USE_QSV