Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
e29df8f7
F
Ffmpeg
项目概览
小白菜888
/
Ffmpeg
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Ffmpeg
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e29df8f7
编写于
10月 02, 2016
作者:
M
Matt Oliver
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
projects :Update for recent upstream merge.
上级
20b6546e
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
42 addition
and
20 deletion
+42
-20
SMP/config.asm
SMP/config.asm
+2
-3
SMP/config.h
SMP/config.h
+2
-3
SMP/libavformat.def
SMP/libavformat.def
+1
-0
SMP/libavutil.vcxproj
SMP/libavutil.vcxproj
+30
-14
SMP/libavutil.vcxproj.filters
SMP/libavutil.vcxproj.filters
+6
-0
SMP/libswresample.def
SMP/libswresample.def
+1
-0
未找到文件。
SMP/config.asm
浏览文件 @
e29df8f7
...
...
@@ -435,14 +435,15 @@
%define CONFIG_MANPAGES 0
%define CONFIG_PODPAGES 0
%define CONFIG_TXTPAGES 0
%define CONFIG_AVIO_READING_EXAMPLE 0
%define CONFIG_AVIO_DIR_CMD_EXAMPLE 0
%define CONFIG_AVIO_READING_EXAMPLE 0
%define CONFIG_DECODING_ENCODING_EXAMPLE 0
%define CONFIG_DEMUXING_DECODING_EXAMPLE 0
%define CONFIG_EXTRACT_MVS_EXAMPLE 0
%define CONFIG_FILTER_AUDIO_EXAMPLE 0
%define CONFIG_FILTERING_AUDIO_EXAMPLE 0
%define CONFIG_FILTERING_VIDEO_EXAMPLE 0
%define CONFIG_HTTP_MULTICLIENT_EXAMPLE 0
%define CONFIG_METADATA_EXAMPLE 0
%define CONFIG_MUXING_EXAMPLE 0
%define CONFIG_QSVDEC_EXAMPLE 0
...
...
@@ -471,7 +472,6 @@
%define CONFIG_LIBCELT 0
%define CONFIG_LIBDC1394 0
%define CONFIG_LIBEBUR128 0
%define CONFIG_LIBFAAC 0
%define CONFIG_LIBFDK_AAC 0
%define CONFIG_LIBFLITE 0
%define CONFIG_LIBFONTCONFIG 1
...
...
@@ -1579,7 +1579,6 @@
%define CONFIG_ILBC_AT_ENCODER 0
%define CONFIG_PCM_ALAW_AT_ENCODER 0
%define CONFIG_PCM_MULAW_AT_ENCODER 0
%define CONFIG_LIBFAAC_ENCODER 0
%define CONFIG_LIBFDK_AAC_ENCODER 0
%define CONFIG_LIBGSM_ENCODER 0
%define CONFIG_LIBGSM_MS_ENCODER 0
...
...
SMP/config.h
浏览文件 @
e29df8f7
...
...
@@ -477,14 +477,15 @@
#define CONFIG_MANPAGES 0
#define CONFIG_PODPAGES 0
#define CONFIG_TXTPAGES 0
#define CONFIG_AVIO_READING_EXAMPLE 0
#define CONFIG_AVIO_DIR_CMD_EXAMPLE 0
#define CONFIG_AVIO_READING_EXAMPLE 0
#define CONFIG_DECODING_ENCODING_EXAMPLE 0
#define CONFIG_DEMUXING_DECODING_EXAMPLE 0
#define CONFIG_EXTRACT_MVS_EXAMPLE 0
#define CONFIG_FILTER_AUDIO_EXAMPLE 0
#define CONFIG_FILTERING_AUDIO_EXAMPLE 0
#define CONFIG_FILTERING_VIDEO_EXAMPLE 0
#define CONFIG_HTTP_MULTICLIENT_EXAMPLE 0
#define CONFIG_METADATA_EXAMPLE 0
#define CONFIG_MUXING_EXAMPLE 0
#define CONFIG_QSVDEC_EXAMPLE 0
...
...
@@ -513,7 +514,6 @@
#define CONFIG_LIBCELT 0
#define CONFIG_LIBDC1394 0
#define CONFIG_LIBEBUR128 0
#define CONFIG_LIBFAAC 0
#define CONFIG_LIBFDK_AAC 0
#define CONFIG_LIBFLITE 0
#define CONFIG_LIBFONTCONFIG 1
...
...
@@ -1629,7 +1629,6 @@
#define CONFIG_ILBC_AT_ENCODER 0
#define CONFIG_PCM_ALAW_AT_ENCODER 0
#define CONFIG_PCM_MULAW_AT_ENCODER 0
#define CONFIG_LIBFAAC_ENCODER 0
#define CONFIG_LIBFDK_AAC_ENCODER 0
#define CONFIG_LIBGSM_ENCODER 0
#define CONFIG_LIBGSM_MS_ENCODER 0
...
...
SMP/libavformat.def
浏览文件 @
e29df8f7
...
...
@@ -66,6 +66,7 @@ EXPORTS
av_register_output_format
av_sdp_create
av_seek_frame
av_stream_get_codec_timebase
av_stream_get_end_pts
av_stream_get_parser
av_stream_get_r_frame_rate
...
...
SMP/libavutil.vcxproj
浏览文件 @
e29df8f7
...
...
@@ -138,6 +138,7 @@
<ClCompile
Include=
"..\libavutil\xtea.c"
/>
<ClCompile
Include=
"..\libavutil\tea.c"
/>
<ClCompile
Include=
"..\libavutil\hwcontext_dxva2.c"
/>
<ClCompile
Include=
"..\libavutil\hwcontext_qsv.c"
/>
<ClCompile
Include=
"..\libavutil\lzo.c"
/>
<ClCompile
Include=
"..\compat\msvcrt\snprintf.c"
/>
<ClCompile
Include=
"..\compat\strtod.c"
/>
...
...
@@ -196,6 +197,7 @@
<ClInclude
Include=
"..\libavutil\hwcontext.h"
/>
<ClInclude
Include=
"..\libavutil\hwcontext_cuda.h"
/>
<ClInclude
Include=
"..\libavutil\hwcontext_dxva2.h"
/>
<ClInclude
Include=
"..\libavutil\hwcontext_qsv.h"
/>
<ClInclude
Include=
"..\libavutil\hwcontext_vaapi.h"
/>
<ClInclude
Include=
"..\libavutil\hwcontext_vdpau.h"
/>
<ClInclude
Include=
"..\libavutil\imgutils.h"
/>
...
...
@@ -502,7 +504,7 @@
<TargetMachine>
MachineX86
</TargetMachine>
<SubSystem>
Windows
</SubSystem>
<OutputFile>
$(OutDir)\lib\x86\$(TargetName)$(TargetExt)
</OutputFile>
<AdditionalDependencies>
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
libmfxd.lib;
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<AdditionalOptions>
/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)
</AdditionalOptions>
</Lib>
...
...
@@ -542,6 +544,7 @@ copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
...
...
@@ -642,7 +645,7 @@ cd $(ProjectDir)
<TargetMachine>
MachineX64
</TargetMachine>
<SubSystem>
Windows
</SubSystem>
<OutputFile>
$(OutDir)\lib\x64\$(TargetName)$(TargetExt)
</OutputFile>
<AdditionalDependencies>
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
libmfxd.lib;
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<AdditionalOptions>
/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)
</AdditionalOptions>
</Lib>
...
...
@@ -682,6 +685,7 @@ copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
...
...
@@ -785,7 +789,7 @@ cd $(ProjectDir)
<ProgramDatabaseFile>
$(OutDir)\lib\x86\$(TargetName).pdb
</ProgramDatabaseFile>
<ModuleDefinitionFile>
.\libavutil.def
</ModuleDefinitionFile>
<ProfileGuidedDatabase>
$(IntDir)\$(TargetName).pgd
</ProfileGuidedDatabase>
<AdditionalDependencies>
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
mfxd.lib;
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<LargeAddressAware>
true
</LargeAddressAware>
<GenerateDebugInformation>
true
</GenerateDebugInformation>
...
...
@@ -828,6 +832,7 @@ copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
...
...
@@ -936,7 +941,7 @@ echo These errors are the result of dead code elimination not being p
<ProgramDatabaseFile>
$(OutDir)\lib\x64\$(TargetName).pdb
</ProgramDatabaseFile>
<ModuleDefinitionFile>
.\libavutil.def
</ModuleDefinitionFile>
<ProfileGuidedDatabase>
$(IntDir)\$(TargetName).pgd
</ProfileGuidedDatabase>
<AdditionalDependencies>
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
mfxd.lib;
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<GenerateDebugInformation>
true
</GenerateDebugInformation>
<ForceFileOutput>
UndefinedSymbolOnly
</ForceFileOutput>
...
...
@@ -978,6 +983,7 @@ copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
...
...
@@ -1086,7 +1092,7 @@ echo These errors are the result of dead code elimination not being p
<ProgramDatabaseFile>
$(OutDir)\lib\x86\$(TargetName).pdb
</ProgramDatabaseFile>
<ModuleDefinitionFile>
.\libavutil.def
</ModuleDefinitionFile>
<ProfileGuidedDatabase>
$(IntDir)\$(TargetName).pgd
</ProfileGuidedDatabase>
<AdditionalDependencies>
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
libmfxd.lib;
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<LargeAddressAware>
true
</LargeAddressAware>
<GenerateDebugInformation>
true
</GenerateDebugInformation>
...
...
@@ -1129,6 +1135,7 @@ copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
...
...
@@ -1237,7 +1244,7 @@ echo These errors are the result of dead code elimination not being p
<ProgramDatabaseFile>
$(OutDir)\lib\x64\$(TargetName).pdb
</ProgramDatabaseFile>
<ModuleDefinitionFile>
.\libavutil.def
</ModuleDefinitionFile>
<ProfileGuidedDatabase>
$(IntDir)\$(TargetName).pgd
</ProfileGuidedDatabase>
<AdditionalDependencies>
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
libmfxd.lib;
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<GenerateDebugInformation>
true
</GenerateDebugInformation>
<ForceFileOutput>
UndefinedSymbolOnly
</ForceFileOutput>
...
...
@@ -1279,6 +1286,7 @@ copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
...
...
@@ -1390,7 +1398,7 @@ echo These errors are the result of dead code elimination not being p
<TargetMachine>
MachineX86
</TargetMachine>
<SubSystem>
Windows
</SubSystem>
<OutputFile>
$(OutDir)\lib\x86\$(TargetName)$(TargetExt)
</OutputFile>
<AdditionalDependencies>
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
libmfx.lib;
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<AdditionalOptions>
/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)
</AdditionalOptions>
</Lib>
...
...
@@ -1430,6 +1438,7 @@ copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
...
...
@@ -1536,7 +1545,7 @@ cd $(ProjectDir)
<TargetMachine>
MachineX64
</TargetMachine>
<SubSystem>
Windows
</SubSystem>
<OutputFile>
$(OutDir)\lib\x64\$(TargetName)$(TargetExt)
</OutputFile>
<AdditionalDependencies>
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
libmfx.lib;
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<AdditionalOptions>
/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)
</AdditionalOptions>
</Lib>
...
...
@@ -1576,6 +1585,7 @@ copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
...
...
@@ -1687,7 +1697,7 @@ cd $(ProjectDir)
<ProgramDatabaseFile>
$(OutDir)\lib\x86\$(TargetName).pdb
</ProgramDatabaseFile>
<ModuleDefinitionFile>
.\libavutil.def
</ModuleDefinitionFile>
<ProfileGuidedDatabase>
$(IntDir)\$(TargetName).pgd
</ProfileGuidedDatabase>
<AdditionalDependencies>
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
mfx.lib;
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<LargeAddressAware>
true
</LargeAddressAware>
<AdditionalOptions>
/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)
</AdditionalOptions>
...
...
@@ -1729,6 +1739,7 @@ copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
...
...
@@ -1840,7 +1851,7 @@ cd $(ProjectDir)
<ProgramDatabaseFile>
$(OutDir)\lib\x64\$(TargetName).pdb
</ProgramDatabaseFile>
<ModuleDefinitionFile>
.\libavutil.def
</ModuleDefinitionFile>
<ProfileGuidedDatabase>
$(IntDir)\$(TargetName).pgd
</ProfileGuidedDatabase>
<AdditionalDependencies>
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
mfx.lib;
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<AdditionalOptions>
/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)
</AdditionalOptions>
<GenerateDebugInformation>
true
</GenerateDebugInformation>
...
...
@@ -1881,6 +1892,7 @@ copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
...
...
@@ -1992,7 +2004,7 @@ cd $(ProjectDir)
<ProgramDatabaseFile>
$(OutDir)\lib\x86\$(TargetName).pdb
</ProgramDatabaseFile>
<ModuleDefinitionFile>
.\libavutil.def
</ModuleDefinitionFile>
<ProfileGuidedDatabase>
$(IntDir)\$(TargetName).pgd
</ProfileGuidedDatabase>
<AdditionalDependencies>
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
libmfx.lib;
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<LargeAddressAware>
true
</LargeAddressAware>
<AdditionalOptions>
/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)
</AdditionalOptions>
...
...
@@ -2034,6 +2046,7 @@ copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
...
...
@@ -2145,7 +2158,7 @@ cd $(ProjectDir)
<ProgramDatabaseFile>
$(OutDir)\lib\x64\$(TargetName).pdb
</ProgramDatabaseFile>
<ModuleDefinitionFile>
.\libavutil.def
</ModuleDefinitionFile>
<ProfileGuidedDatabase>
$(IntDir)\$(TargetName).pgd
</ProfileGuidedDatabase>
<AdditionalDependencies>
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
libmfx.lib;
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<AdditionalOptions>
/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)
</AdditionalOptions>
<GenerateDebugInformation>
true
</GenerateDebugInformation>
...
...
@@ -2186,6 +2199,7 @@ copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
...
...
@@ -2292,7 +2306,7 @@ cd $(ProjectDir)
<TargetMachine>
MachineX86
</TargetMachine>
<SubSystem>
Windows
</SubSystem>
<OutputFile>
$(OutDir)\lib\x86\$(TargetName)$(TargetExt)
</OutputFile>
<AdditionalDependencies>
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
libmfx.lib;
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<AdditionalOptions>
/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)
</AdditionalOptions>
</Lib>
...
...
@@ -2332,6 +2346,7 @@ copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
...
...
@@ -2438,7 +2453,7 @@ cd $(ProjectDir)
<TargetMachine>
MachineX64
</TargetMachine>
<SubSystem>
Windows
</SubSystem>
<OutputFile>
$(OutDir)\lib\x64\$(TargetName)$(TargetExt)
</OutputFile>
<AdditionalDependencies>
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
libmfx.lib;
%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<AdditionalOptions>
/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)
</AdditionalOptions>
</Lib>
...
...
@@ -2478,6 +2493,7 @@ copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
...
...
SMP/libavutil.vcxproj.filters
浏览文件 @
e29df8f7
...
...
@@ -240,6 +240,9 @@
<ClCompile
Include=
"..\libavutil\hwcontext_dxva2.c"
>
<Filter>
Source Files\libavutil
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavutil\hwcontext_qsv.c"
>
<Filter>
Source Files\libavutil
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavutil\lzo.c"
>
<Filter>
Source Files\libavutil
</Filter>
</ClCompile>
...
...
@@ -380,6 +383,9 @@
<ClInclude
Include=
"..\libavutil\hwcontext_dxva2.h"
>
<Filter>
Header Files\libavutil
</Filter>
</ClInclude>
<ClInclude
Include=
"..\libavutil\hwcontext_qsv.h"
>
<Filter>
Header Files\libavutil
</Filter>
</ClInclude>
<ClInclude
Include=
"..\libavutil\hwcontext_vaapi.h"
>
<Filter>
Header Files\libavutil
</Filter>
</ClInclude>
...
...
SMP/libswresample.def
浏览文件 @
e29df8f7
EXPORTS
swr_alloc
swr_alloc_set_opts
swr_build_matrix
swr_close
swr_config_frame
swr_convert
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录