diff --git a/src/ImageConverter.cpp b/src/ImageConverter.cpp index 8345dfe3..58a51301 100644 --- a/src/ImageConverter.cpp +++ b/src/ImageConverter.cpp @@ -1,6 +1,6 @@ /****************************************************************************** ImageConverter: Base class for image resizing & color model convertion - Copyright (C) 2012-2013 Wang Bin + Copyright (C) 2012-2014 Wang Bin * This file is part of QtAV @@ -35,7 +35,9 @@ extern void RegisterImageConverterIPP_Man(); void ImageConverter_RegisterAll() { RegisterImageConverterFF_Man(); +#if QTAV_HAVE(IPP) RegisterImageConverterIPP_Man(); +#endif //QTAV_HAVE(IPP) } diff --git a/src/ImageConverterIPP.cpp b/src/ImageConverterIPP.cpp index a6e8419b..00c80032 100644 --- a/src/ImageConverterIPP.cpp +++ b/src/ImageConverterIPP.cpp @@ -1,6 +1,6 @@ /****************************************************************************** ImageConverterIPP: Image resizing & color model convertion using Intel IPP - Copyright (C) 2012-2013 Wang Bin + Copyright (C) 2012-2014 Wang Bin * This file is part of QtAV @@ -24,7 +24,7 @@ #include #include "prepost.h" -#ifdef IPP_LINK +#if QTAV_HAVE(IPP) #include #else @@ -68,7 +68,7 @@ bool ImageConverterIPP::convert(const quint8 *const srcSlice[], const int srcStr { DPTR_D(ImageConverterIPP); //color convertion, no scale -#ifdef IPP_LINK +#if QTAV_HAVE(IPP) struct { const quint8 *data[3]; int linesize[3]; diff --git a/src/libQtAV.pro b/src/libQtAV.pro index 2d0e4f7a..9d3f96ac 100644 --- a/src/libQtAV.pro +++ b/src/libQtAV.pro @@ -52,10 +52,11 @@ config_avresample { SOURCES += AudioResamplerLibav.cpp LIBS += -lavresample } -ipp-link { - DEFINES += IPP_LINK +config_ipp { + DEFINES += QTAV_HAVE_IPP=1 ICCROOT = $$(IPPROOT)/../compiler INCLUDEPATH += $$(IPPROOT)/include + SOURCES += ImageConverterIPP.cpp message("QMAKE_TARGET.arch" $$QMAKE_TARGET.arch) *64|contains(QMAKE_TARGET.arch, x86_64)|contains(TARGET_ARCH, x86_64) { IPPARCH=intel64 @@ -162,7 +163,6 @@ SOURCES += \ GraphicsItemRenderer.cpp \ ImageConverter.cpp \ ImageConverterFF.cpp \ - ImageConverterIPP.cpp \ QPainterRenderer.cpp \ OSD.cpp \ OSDFilter.cpp \