diff options
| -rw-r--r-- | contrib/ffmpeg/A00-qsv.patch | 8 | ||||
| -rw-r--r-- | contrib/libmfx/module.defs | 2 | ||||
| -rw-r--r-- | libhb/qsv_common.h | 4 | ||||
| -rw-r--r-- | libhb/qsv_filter_pp.h | 2 | ||||
| -rw-r--r-- | libhb/qsv_memory.h | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/contrib/ffmpeg/A00-qsv.patch b/contrib/ffmpeg/A00-qsv.patch index d98132f26..1082d7924 100644 --- a/contrib/ffmpeg/A00-qsv.patch +++ b/contrib/ffmpeg/A00-qsv.patch @@ -22,7 +22,7 @@ index 5085333..7283fb1 100755 # hardware accelerators dxva2_deps="dxva2api_h" -+qsv_deps="msdk_mfxvideo_h" ++qsv_deps="mfx_mfxvideo_h" vaapi_deps="va_va_h" vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads" vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore" @@ -39,7 +39,7 @@ index 5085333..7283fb1 100755 check_header io.h check_header mach/mach_time.h check_header malloc.h -+check_header msdk/mfxvideo.h ++check_header mfx/mfxvideo.h check_header poll.h check_header sys/mman.h check_header sys/param.h @@ -830,7 +830,7 @@ index 0000000..52378cf + * Note: Compilation would require: + * - Intel MediaSDK headers, Full SDK is avaialble from the original web site: + * http://software.intel.com/en-us/vcsource/tools/media-SDK -+ * Will be referenced as msdk/*.h (mfxdefs.h, mfxstructures.h, ... ) ++ * Will be referenced as mfx/*.h (mfxdefs.h, mfxstructures.h, ... ) + * and + * - Final application has to link against Intel MediaSDK dispatcher, available + * at MediaSDK as well @@ -868,7 +868,7 @@ index 0000000..52378cf + +#include <stdint.h> +#include <string.h> -+#include "msdk/mfxvideo.h" ++#include "mfx/mfxvideo.h" +#include "libavutil/mem.h" +#include "libavutil/time.h" + diff --git a/contrib/libmfx/module.defs b/contrib/libmfx/module.defs index 8d607c7fe..3c6407921 100644 --- a/contrib/libmfx/module.defs +++ b/contrib/libmfx/module.defs @@ -1,7 +1,7 @@ $(eval $(call import.MODULE.defs,LIBMFX,libmfx)) $(eval $(call import.CONTRIB.defs,LIBMFX)) -LIBMFX.FETCH.url = http://download.handbrake.fr/contrib/libmfx-v6.0.0.349.tar.bz2 +LIBMFX.FETCH.url = http://download.handbrake.fr/contrib/mfx_dispatch-9f4a84d7.tar.gz LIBMFX.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache; autoreconf -fiv; diff --git a/libhb/qsv_common.h b/libhb/qsv_common.h index b1adc5c5a..18208bbf7 100644 --- a/libhb/qsv_common.h +++ b/libhb/qsv_common.h @@ -10,8 +10,8 @@ #ifndef HB_QSV_COMMON_H #define HB_QSV_COMMON_H -#include "msdk/mfxvideo.h" -#include "msdk/mfxplugin.h" +#include "mfx/mfxvideo.h" +#include "mfx/mfxplugin.h" #include "libavcodec/avcodec.h" /* Minimum Intel Media SDK version (currently 1.3, for Sandy Bridge support) */ diff --git a/libhb/qsv_filter_pp.h b/libhb/qsv_filter_pp.h index 8a72ad5b2..99835b8a6 100644 --- a/libhb/qsv_filter_pp.h +++ b/libhb/qsv_filter_pp.h @@ -29,7 +29,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef QSV_FILTER_PP_H #define QSV_FILTER_PP_H -#include "msdk/mfxplugin.h" +#include "mfx/mfxplugin.h" struct qsv_filter_task_s; diff --git a/libhb/qsv_memory.h b/libhb/qsv_memory.h index 2d0f51208..b2a5b0302 100644 --- a/libhb/qsv_memory.h +++ b/libhb/qsv_memory.h @@ -30,7 +30,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define QSV_MEMORY_H #include "libavcodec/qsv.h" -#include "msdk/mfxplugin.h" +#include "mfx/mfxplugin.h" typedef struct{ |