using dispatcher from https://github.com/lu-zero/mfx_dispatch

diff --git a/contrib/ffmpeg/A00-qsv.patch b/contrib/ffmpeg/A00-qsv.patch
index d98132f268470fc2762d2a4fa5122f16a562f564..1082d792453ddf19a3512d12f8334041d69ff3b9 100644 (file)
--- 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 8d607c7feb97a7af059b7dfc4bf66050cd938a8b..3c64079218a4bab29b86248558d78b6a924a5c08 100644 (file)
--- 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 b1adc5c5ae1bec804dfd9c81d79f4620533d3c45..18208bbf7d1ec1cb611092e3fb39f8c97bfb2efe 100644 (file)
--- 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 8a72ad5b204d9edb7855d7801bfdb4a043cf35f9..99835b8a6696f3c492a403f1c028f611a9d1353b 100644 (file)
--- 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 2d0f512080aa21a0769fa49b31116613a25ac255..b2a5b0302f15162dba28127dfa52127c543583e0 100644 (file)
--- 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{