提交 0e34335f 编写于 作者: M Matt Oliver

projects: Update projects to support Quick Sync video by default.

上级 6127b031
......@@ -406,7 +406,7 @@
%define CONFIG_LIBGSM 0
%define CONFIG_LIBIEC61883 0
%define CONFIG_LIBILBC 1
%define CONFIG_LIBMFX 0
%define CONFIG_LIBMFX 1
%define CONFIG_LIBMODPLUG 1
%define CONFIG_LIBMP3LAME 1
%define CONFIG_LIBNUT 0
......@@ -498,7 +498,7 @@
%define CONFIG_MDCT 1
%define CONFIG_PIXELUTILS 1
%define CONFIG_NETWORK 1
%define CONFIG_QSV 0
%define CONFIG_QSV 1
%define CONFIG_RDFT 1
%define CONFIG_FONTCONFIG 1
%define CONFIG_INCOMPATIBLE_LIBAV_ABI 0
......@@ -646,7 +646,7 @@
%define CONFIG_H263P_DECODER 1
%define CONFIG_H264_DECODER 1
%define CONFIG_H264_CRYSTALHD_DECODER 0
%define CONFIG_H264_QSV_DECODER 0
%define CONFIG_H264_QSV_DECODER 1
%define CONFIG_H264_VDA_DECODER 0
%define CONFIG_H264_VDPAU_DECODER 0
%define CONFIG_HEVC_DECODER 1
......@@ -1591,7 +1591,7 @@
%define CONFIG_H263_VAAPI_HWACCEL 0
%define CONFIG_H263_VDPAU_HWACCEL 0
%define CONFIG_H264_DXVA2_HWACCEL 1
%define CONFIG_H264_QSV_HWACCEL 0
%define CONFIG_H264_QSV_HWACCEL 1
%define CONFIG_H264_VAAPI_HWACCEL 0
%define CONFIG_H264_VDA_HWACCEL 0
%define CONFIG_H264_VDA_OLD_HWACCEL 0
......
/* Automatically generated by SMP project_generate - do not modify! */
#ifndef FFMPEG_CONFIG_H
#define FFMPEG_CONFIG_H
#define FFMPEG_CONFIGURATION "--enable-gpl --enable-version3 --enable-avisynth --enable-nonfree --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --enable-libfdk-aac --enable-libtheora --enable-libx264 --enable-libx265 --enable-libxvid --enable-libvpx --enable-libgme --enable-libmodplug --enable-libsoxr --enable-libfreetype --enable-fontconfig --enable-libfribidi --enable-libass --enable-gnutls --enable-librtmp --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-opencl --enable-nvenc --toolchain=msvc"
#define FFMPEG_CONFIGURATION "--enable-gpl --enable-version3 --enable-avisynth --enable-nonfree --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --enable-libfdk-aac --enable-libtheora --enable-libx264 --enable-libx265 --enable-libxvid --enable-libvpx --enable-libgme --enable-libmodplug --enable-libsoxr --enable-libfreetype --enable-fontconfig --enable-libfribidi --enable-libass --enable-gnutls --enable-librtmp --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-opencl --enable-nvenc --enable-libmfx --toolchain=msvc"
#define FFMPEG_LICENSE "nonfree and unredistributable"
#define CONFIG_THIS_YEAR 2015
#define FFMPEG_DATADIR "."
......@@ -445,7 +445,7 @@
#define CONFIG_LIBGSM 0
#define CONFIG_LIBIEC61883 0
#define CONFIG_LIBILBC 1
#define CONFIG_LIBMFX 0
#define CONFIG_LIBMFX 1
#define CONFIG_LIBMODPLUG 1
#define CONFIG_LIBMP3LAME 1
#define CONFIG_LIBNUT 0
......@@ -545,7 +545,7 @@
#define CONFIG_MDCT 1
#define CONFIG_PIXELUTILS 1
#define CONFIG_NETWORK 1
#define CONFIG_QSV 0
#define CONFIG_QSV 1
#define CONFIG_RDFT 1
#define CONFIG_FONTCONFIG 1
#define CONFIG_INCOMPATIBLE_LIBAV_ABI 0
......@@ -693,7 +693,7 @@
#define CONFIG_H263P_DECODER 1
#define CONFIG_H264_DECODER 1
#define CONFIG_H264_CRYSTALHD_DECODER 0
#define CONFIG_H264_QSV_DECODER 0
#define CONFIG_H264_QSV_DECODER 1
#define CONFIG_H264_VDA_DECODER 0
#define CONFIG_H264_VDPAU_DECODER 0
#define CONFIG_HEVC_DECODER 1
......@@ -1638,7 +1638,7 @@
#define CONFIG_H263_VAAPI_HWACCEL 0
#define CONFIG_H263_VDPAU_HWACCEL 0
#define CONFIG_H264_DXVA2_HWACCEL 1
#define CONFIG_H264_QSV_HWACCEL 0
#define CONFIG_H264_QSV_HWACCEL 1
#define CONFIG_H264_VAAPI_HWACCEL 0
#define CONFIG_H264_VDA_HWACCEL 0
#define CONFIG_H264_VDA_OLD_HWACCEL 0
......
此差异已折叠。
......@@ -491,6 +491,9 @@
<ClCompile Include="..\libavcodec\qpeldsp.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\qsv.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\rangecoder.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -1136,6 +1139,9 @@
<ClCompile Include="..\libavcodec\h264_slice.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\qsv_h264.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\hevc.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......
cd bin
project_generate.exe --enable-gpl --enable-version3 --enable-avisynth --enable-nonfree --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --enable-libfdk-aac --enable-libtheora --enable-libx264 --enable-libx265 --enable-libxvid --enable-libvpx --enable-libgme --enable-libmodplug --enable-libsoxr --enable-libfreetype --enable-fontconfig --enable-libfribidi --enable-libass --enable-gnutls --enable-librtmp --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-opencl --enable-nvenc --toolchain=msvc
\ No newline at end of file
project_generate.exe --enable-gpl --enable-version3 --enable-avisynth --enable-nonfree --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --enable-libfdk-aac --enable-libtheora --enable-libx264 --enable-libx265 --enable-libxvid --enable-libvpx --enable-libgme --enable-libmodplug --enable-libsoxr --enable-libfreetype --enable-fontconfig --enable-libfribidi --enable-libass --enable-gnutls --enable-librtmp --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-opencl --enable-nvenc --enable-libmfx --toolchain=msvc
\ No newline at end of file
......@@ -46,11 +46,11 @@ Most of these dependencies (and there dependencies) are available in the ShiftMe
However the following is a list of extra dependency options that require external downloads:
1) sdl (requires SDL 1.2)
a) Download pre-built binaries from the sdl homepage.
b) Extract all the header files into OutputDir/include/SDL*.
b) Extract all the header files into OutputDir/include/SDL/*.
c) Extract the lib's to OutputDir/lib* and the DLL's to OutputDir/bin*.
2) opengl (requires glext)
a) Download glext from the glext homepage.
b) Extract all the header files into OutputDir/include/gl*.
b) Extract all the header files into OutputDir/include/gl/*.
3) opencl (requires Intel or AMD OpenCL SDK, NVIDIAs does not support required features)
a) Download either the "Intel OpenCL SDK" or the "AMD OpenCL SDK" from their respective suppliers.
Note: The default projects use the Intel SDK.
......@@ -63,6 +63,10 @@ However the following is a list of extra dependency options that require externa
c) Download the "NVIDIA Video Codec SDK" from the NVIDIA website.
d) Copy 'nvEncodeAPI.h' from the "NVIDIA Video Codec SDK" into the installed %CUDA%\include folder
(where %CUDA% is the location that the CUDA SDK was installed).
5) libmfx (requires Intel Media SDK)
a) Download the "Intel Media SDK" as part of the "Intel Integrated Native Developer Experience" from the Intel website.
b) Install the downloaded SDK wherever desired.
c) Copy the SDK headers found in the SDKs include directory into a new subdirectory named "mfx".
*OutputDir is the "Output Directory" specified in the project properties.
Note: There is a different OutputDir for 32/64bit configurations. Lib's and DLL's should be placed in the correct directory.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册