Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
4573ffe6
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,体验更适合开发者的 AI 搜索 >>
提交
4573ffe6
编写于
9月 28, 2016
作者:
M
Matt Oliver
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
projects: Update for recent upstream merge.
上级
df4acc64
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
48 addition
and
32 deletion
+48
-32
SMP/config.asm
SMP/config.asm
+6
-2
SMP/config.h
SMP/config.h
+6
-2
SMP/ffplay.vcxproj
SMP/ffplay.vcxproj
+8
-8
SMP/libavcodec.vcxproj
SMP/libavcodec.vcxproj
+2
-1
SMP/libavcodec.vcxproj.filters
SMP/libavcodec.vcxproj.filters
+6
-3
SMP/libavdevice.vcxproj
SMP/libavdevice.vcxproj
+15
-15
SMP/libavdevice.vcxproj.filters
SMP/libavdevice.vcxproj.filters
+1
-1
SMP/libavfilter.vcxproj
SMP/libavfilter.vcxproj
+1
-0
SMP/libavfilter.vcxproj.filters
SMP/libavfilter.vcxproj.filters
+3
-0
未找到文件。
SMP/config.asm
浏览文件 @
4573ffe6
...
...
@@ -410,7 +410,7 @@
%define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
%define HAVE_PERL 0
%define HAVE_POD2MAN 0
%define HAVE_SDL 1
%define HAVE_SDL
2
1
%define HAVE_SECTION_DATA_REL_RO 0
%define HAVE_TEXI2HTML 0
%define HAVE_THREADS 1
...
...
@@ -532,6 +532,7 @@
%define CONFIG_OPENSSL 0
%define CONFIG_SCHANNEL 0
%define CONFIG_SDL 1
%define CONFIG_SDL2 1
%define CONFIG_SECURETRANSPORT 0
%define CONFIG_VIDEOTOOLBOX 0
%define CONFIG_X11GRAB 0
...
...
@@ -1513,12 +1514,14 @@
%define CONFIG_EAC3_ENCODER 1
%define CONFIG_FLAC_ENCODER 1
%define CONFIG_G723_1_ENCODER 1
%define CONFIG_MLP_ENCODER 1
%define CONFIG_MP2_ENCODER 1
%define CONFIG_MP2FIXED_ENCODER 1
%define CONFIG_NELLYMOSER_ENCODER 1
%define CONFIG_RA_144_ENCODER 1
%define CONFIG_SONIC_ENCODER 1
%define CONFIG_SONIC_LS_ENCODER 1
%define CONFIG_TRUEHD_ENCODER 1
%define CONFIG_TTA_ENCODER 1
%define CONFIG_VORBIS_ENCODER 1
%define CONFIG_WAVPACK_ENCODER 1
...
...
@@ -1807,6 +1810,7 @@
%define CONFIG_MINTERPOLATE_FILTER 1
%define CONFIG_MPDECIMATE_FILTER 1
%define CONFIG_NEGATE_FILTER 1
%define CONFIG_NLMEANS_FILTER 1
%define CONFIG_NNEDI_FILTER 1
%define CONFIG_NOFORMAT_FILTER 1
%define CONFIG_NOISE_FILTER 1
...
...
@@ -2158,7 +2162,7 @@
%define CONFIG_OPENGL_OUTDEV 1
%define CONFIG_OSS_OUTDEV 0
%define CONFIG_PULSE_OUTDEV 0
%define CONFIG_SDL_OUTDEV 1
%define CONFIG_SDL
2
_OUTDEV 1
%define CONFIG_SNDIO_OUTDEV 0
%define CONFIG_V4L2_OUTDEV 0
%define CONFIG_XV_OUTDEV 0
...
...
SMP/config.h
浏览文件 @
4573ffe6
...
...
@@ -452,7 +452,7 @@
#define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
#define HAVE_PERL 0
#define HAVE_POD2MAN 0
#define HAVE_SDL 1
#define HAVE_SDL
2
1
#define HAVE_SECTION_DATA_REL_RO 0
#define HAVE_TEXI2HTML 0
#define HAVE_THREADS 1
...
...
@@ -574,6 +574,7 @@
#define CONFIG_OPENSSL 0
#define CONFIG_SCHANNEL 0
#define CONFIG_SDL 1
#define CONFIG_SDL2 1
#define CONFIG_SECURETRANSPORT 0
#define CONFIG_VIDEOTOOLBOX 0
#define CONFIG_X11GRAB 0
...
...
@@ -1563,12 +1564,14 @@
#define CONFIG_EAC3_ENCODER 1
#define CONFIG_FLAC_ENCODER 1
#define CONFIG_G723_1_ENCODER 1
#define CONFIG_MLP_ENCODER 1
#define CONFIG_MP2_ENCODER 1
#define CONFIG_MP2FIXED_ENCODER 1
#define CONFIG_NELLYMOSER_ENCODER 1
#define CONFIG_RA_144_ENCODER 1
#define CONFIG_SONIC_ENCODER 1
#define CONFIG_SONIC_LS_ENCODER 1
#define CONFIG_TRUEHD_ENCODER 1
#define CONFIG_TTA_ENCODER 1
#define CONFIG_VORBIS_ENCODER 1
#define CONFIG_WAVPACK_ENCODER 1
...
...
@@ -1857,6 +1860,7 @@
#define CONFIG_MINTERPOLATE_FILTER 1
#define CONFIG_MPDECIMATE_FILTER 1
#define CONFIG_NEGATE_FILTER 1
#define CONFIG_NLMEANS_FILTER 1
#define CONFIG_NNEDI_FILTER 1
#define CONFIG_NOFORMAT_FILTER 1
#define CONFIG_NOISE_FILTER 1
...
...
@@ -2218,7 +2222,7 @@
#define CONFIG_OPENGL_OUTDEV 1
#define CONFIG_OSS_OUTDEV 0
#define CONFIG_PULSE_OUTDEV 0
#define CONFIG_SDL_OUTDEV 1
#define CONFIG_SDL
2
_OUTDEV 1
#define CONFIG_SNDIO_OUTDEV 0
#define CONFIG_V4L2_OUTDEV 0
#define CONFIG_XV_OUTDEV 0
...
...
SMP/ffplay.vcxproj
浏览文件 @
4573ffe6
...
...
@@ -192,7 +192,7 @@
<Link>
<SubSystem>
Console
</SubSystem>
<ProfileGuidedDatabase>
$(IntDir)\$(TargetName).pgd
</ProfileGuidedDatabase>
<AdditionalDependencies>
Psapi.lib;libavdeviced.lib;libavfilterd.lib;libavformatd.lib;libavcodecd.lib;libpostprocd.lib;libswresampled.lib;libswscaled.lib;libavutild.lib;libsdld.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
Psapi.lib;libavdeviced.lib;libavfilterd.lib;libavformatd.lib;libavcodecd.lib;libpostprocd.lib;libswresampled.lib;libswscaled.lib;libavutild.lib;libsdl
2
d.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<OutputFile>
$(OutDir)\bin\x86\$(TargetName)$(TargetExt)
</OutputFile>
<ProgramDatabaseFile>
$(OutDir)\lib\x86\$(TargetName).pdb
</ProgramDatabaseFile>
...
...
@@ -251,7 +251,7 @@ echo These errors are the result of dead code elimination not being p
<Link>
<SubSystem>
Console
</SubSystem>
<ProfileGuidedDatabase>
$(IntDir)\$(TargetName).pgd
</ProfileGuidedDatabase>
<AdditionalDependencies>
Psapi.lib;libavdeviced.lib;libavfilterd.lib;libavformatd.lib;libavcodecd.lib;libpostprocd.lib;libswresampled.lib;libswscaled.lib;libavutild.lib;libsdld.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
Psapi.lib;libavdeviced.lib;libavfilterd.lib;libavformatd.lib;libavcodecd.lib;libpostprocd.lib;libswresampled.lib;libswscaled.lib;libavutild.lib;libsdl
2
d.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<OutputFile>
$(OutDir)\bin\x64\$(TargetName)$(TargetExt)
</OutputFile>
<ProgramDatabaseFile>
$(OutDir)\lib\x64\$(TargetName).pdb
</ProgramDatabaseFile>
...
...
@@ -309,7 +309,7 @@ echo These errors are the result of dead code elimination not being p
<Link>
<SubSystem>
Console
</SubSystem>
<ProfileGuidedDatabase>
$(IntDir)\$(TargetName).pgd
</ProfileGuidedDatabase>
<AdditionalDependencies>
Psapi.lib;avdeviced.lib;avfilterd.lib;avformatd.lib;avcodecd.lib;postprocd.lib;swresampled.lib;swscaled.lib;avutild.lib;sdld.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
Psapi.lib;avdeviced.lib;avfilterd.lib;avformatd.lib;avcodecd.lib;postprocd.lib;swresampled.lib;swscaled.lib;avutild.lib;sdl
2
d.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<OutputFile>
$(OutDir)\bin\x86\$(TargetName)$(TargetExt)
</OutputFile>
<ProgramDatabaseFile>
$(OutDir)\lib\x86\$(TargetName).pdb
</ProgramDatabaseFile>
...
...
@@ -368,7 +368,7 @@ echo These errors are the result of dead code elimination not being p
<Link>
<SubSystem>
Console
</SubSystem>
<ProfileGuidedDatabase>
$(IntDir)\$(TargetName).pgd
</ProfileGuidedDatabase>
<AdditionalDependencies>
Psapi.lib;avdeviced.lib;avfilterd.lib;avformatd.lib;avcodecd.lib;postprocd.lib;swresampled.lib;swscaled.lib;avutild.lib;sdld.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
Psapi.lib;avdeviced.lib;avfilterd.lib;avformatd.lib;avcodecd.lib;postprocd.lib;swresampled.lib;swscaled.lib;avutild.lib;sdl
2
d.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<OutputFile>
$(OutDir)\bin\x64\$(TargetName)$(TargetExt)
</OutputFile>
<ProgramDatabaseFile>
$(OutDir)\lib\x64\$(TargetName).pdb
</ProgramDatabaseFile>
...
...
@@ -435,7 +435,7 @@ echo These errors are the result of dead code elimination not being p
<OptimizeReferences>
true
</OptimizeReferences>
<SubSystem>
Console
</SubSystem>
<ProfileGuidedDatabase>
$(IntDir)\$(TargetName).pgd
</ProfileGuidedDatabase>
<AdditionalDependencies>
Psapi.lib;libavdevice.lib;libavfilter.lib;libavformat.lib;libavcodec.lib;libpostproc.lib;libswresample.lib;libswscale.lib;libavutil.lib;libsdl.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
Psapi.lib;libavdevice.lib;libavfilter.lib;libavformat.lib;libavcodec.lib;libpostproc.lib;libswresample.lib;libswscale.lib;libavutil.lib;libsdl
2
.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<OutputFile>
$(OutDir)\bin\x86\$(TargetName)$(TargetExt)
</OutputFile>
<ProgramDatabaseFile>
$(OutDir)\lib\x86\$(TargetName).pdb
</ProgramDatabaseFile>
...
...
@@ -495,7 +495,7 @@ del ..\libavutil\ffversion.h
<OptimizeReferences>
true
</OptimizeReferences>
<SubSystem>
Console
</SubSystem>
<ProfileGuidedDatabase>
$(IntDir)\$(TargetName).pgd
</ProfileGuidedDatabase>
<AdditionalDependencies>
Psapi.lib;libavdevice.lib;libavfilter.lib;libavformat.lib;libavcodec.lib;libpostproc.lib;libswresample.lib;libswscale.lib;libavutil.lib;libsdl.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
Psapi.lib;libavdevice.lib;libavfilter.lib;libavformat.lib;libavcodec.lib;libpostproc.lib;libswresample.lib;libswscale.lib;libavutil.lib;libsdl
2
.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<OutputFile>
$(OutDir)\bin\x64\$(TargetName)$(TargetExt)
</OutputFile>
<ProgramDatabaseFile>
$(OutDir)\lib\x64\$(TargetName).pdb
</ProgramDatabaseFile>
...
...
@@ -554,7 +554,7 @@ del ..\libavutil\ffversion.h
<OptimizeReferences>
true
</OptimizeReferences>
<SubSystem>
Console
</SubSystem>
<ProfileGuidedDatabase>
$(IntDir)\$(TargetName).pgd
</ProfileGuidedDatabase>
<AdditionalDependencies>
Psapi.lib;avdevice.lib;avfilter.lib;avformat.lib;avcodec.lib;postproc.lib;swresample.lib;swscale.lib;avutil.lib;sdl.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
Psapi.lib;avdevice.lib;avfilter.lib;avformat.lib;avcodec.lib;postproc.lib;swresample.lib;swscale.lib;avutil.lib;sdl
2
.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<OutputFile>
$(OutDir)\bin\x86\$(TargetName)$(TargetExt)
</OutputFile>
<ProgramDatabaseFile>
$(OutDir)\lib\x86\$(TargetName).pdb
</ProgramDatabaseFile>
...
...
@@ -614,7 +614,7 @@ del ..\libavutil\ffversion.h
<OptimizeReferences>
true
</OptimizeReferences>
<SubSystem>
Console
</SubSystem>
<ProfileGuidedDatabase>
$(IntDir)\$(TargetName).pgd
</ProfileGuidedDatabase>
<AdditionalDependencies>
Psapi.lib;avdevice.lib;avfilter.lib;avformat.lib;avcodec.lib;postproc.lib;swresample.lib;swscale.lib;avutil.lib;sdl.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
Psapi.lib;avdevice.lib;avfilter.lib;avformat.lib;avcodec.lib;postproc.lib;swresample.lib;swscale.lib;avutil.lib;sdl
2
.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<OutputFile>
$(OutDir)\bin\x64\$(TargetName)$(TargetExt)
</OutputFile>
<ProgramDatabaseFile>
$(OutDir)\lib\x64\$(TargetName).pdb
</ProgramDatabaseFile>
...
...
SMP/libavcodec.vcxproj
浏览文件 @
4573ffe6
...
...
@@ -555,6 +555,8 @@
<ClCompile
Include=
"..\libavcodec\mimic.c"
/>
<ClCompile
Include=
"..\libavcodec\mjpegbdec.c"
/>
<ClCompile
Include=
"..\libavcodec\mlpdec.c"
/>
<ClCompile
Include=
"..\libavcodec\mlpenc.c"
/>
<ClCompile
Include=
"..\libavcodec\mlp.c"
/>
<ClCompile
Include=
"..\libavcodec\mmvideo.c"
/>
<ClCompile
Include=
"..\libavcodec\motionpixels.c"
/>
<ClCompile
Include=
"..\libavcodec\movtextdec.c"
/>
...
...
@@ -840,7 +842,6 @@
<ClCompile
Include=
"..\libavcodec\hevc_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\mjpeg_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\mlp_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\mlp.c"
/>
<ClCompile
Include=
"..\libavcodec\mpeg4video_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\png_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\mpegaudio_parser.c"
/>
...
...
SMP/libavcodec.vcxproj.filters
浏览文件 @
4573ffe6
...
...
@@ -1485,6 +1485,12 @@
<ClCompile
Include=
"..\libavcodec\mlpdec.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\mlpenc.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\mlp.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\mmvideo.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
...
...
@@ -2340,9 +2346,6 @@
<ClCompile
Include=
"..\libavcodec\mlp_parser.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\mlp.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\mpeg4video_parser.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
...
...
SMP/libavdevice.vcxproj
浏览文件 @
4573ffe6
...
...
@@ -83,7 +83,7 @@
<ClCompile
Include=
"..\libavdevice\gdigrab.c"
/>
<ClCompile
Include=
"..\libavdevice\lavfi.c"
/>
<ClCompile
Include=
"..\libavdevice\opengl_enc.c"
/>
<ClCompile
Include=
"..\libavdevice\sdl.c"
/>
<ClCompile
Include=
"..\libavdevice\sdl
2
.c"
/>
<ClCompile
Include=
"..\libavdevice\vfwcap.c"
/>
<ClCompile
Include=
"..\libavdevice\libcdio.c"
/>
</ItemGroup>
...
...
@@ -353,7 +353,7 @@
<TargetMachine>
MachineX86
</TargetMachine>
<SubSystem>
Windows
</SubSystem>
<OutputFile>
$(OutDir)\lib\x86\$(TargetName)$(TargetExt)
</OutputFile>
<AdditionalDependencies>
libcdio_paranoiad.lib;libsdld.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
libcdio_paranoiad.lib;libsdl
2
d.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<AdditionalOptions>
/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)
</AdditionalOptions>
</Lib>
...
...
@@ -417,7 +417,7 @@ cd $(ProjectDir)
<TargetMachine>
MachineX64
</TargetMachine>
<SubSystem>
Windows
</SubSystem>
<OutputFile>
$(OutDir)\lib\x64\$(TargetName)$(TargetExt)
</OutputFile>
<AdditionalDependencies>
libcdio_paranoiad.lib;libsdld.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
libcdio_paranoiad.lib;libsdl
2
d.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<AdditionalOptions>
/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)
</AdditionalOptions>
</Lib>
...
...
@@ -484,7 +484,7 @@ cd $(ProjectDir)
<ProgramDatabaseFile>
$(OutDir)\lib\x86\$(TargetName).pdb
</ProgramDatabaseFile>
<ModuleDefinitionFile>
.\libavdevice.def
</ModuleDefinitionFile>
<ProfileGuidedDatabase>
$(IntDir)\$(TargetName).pgd
</ProfileGuidedDatabase>
<AdditionalDependencies>
avformatd.lib;avcodecd.lib;avutild.lib;avfilterd.lib;cdio_paranoiad.lib;sdld.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
avformatd.lib;avcodecd.lib;avutild.lib;avfilterd.lib;cdio_paranoiad.lib;sdl
2
d.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<LargeAddressAware>
true
</LargeAddressAware>
<GenerateDebugInformation>
true
</GenerateDebugInformation>
...
...
@@ -559,7 +559,7 @@ echo These errors are the result of dead code elimination not being p
<ProgramDatabaseFile>
$(OutDir)\lib\x64\$(TargetName).pdb
</ProgramDatabaseFile>
<ModuleDefinitionFile>
.\libavdevice.def
</ModuleDefinitionFile>
<ProfileGuidedDatabase>
$(IntDir)\$(TargetName).pgd
</ProfileGuidedDatabase>
<AdditionalDependencies>
avformatd.lib;avcodecd.lib;avutild.lib;avfilterd.lib;cdio_paranoiad.lib;sdld.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
avformatd.lib;avcodecd.lib;avutild.lib;avfilterd.lib;cdio_paranoiad.lib;sdl
2
d.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<GenerateDebugInformation>
true
</GenerateDebugInformation>
<ForceFileOutput>
UndefinedSymbolOnly
</ForceFileOutput>
...
...
@@ -633,7 +633,7 @@ echo These errors are the result of dead code elimination not being p
<ProgramDatabaseFile>
$(OutDir)\lib\x86\$(TargetName).pdb
</ProgramDatabaseFile>
<ModuleDefinitionFile>
.\libavdevice.def
</ModuleDefinitionFile>
<ProfileGuidedDatabase>
$(IntDir)\$(TargetName).pgd
</ProfileGuidedDatabase>
<AdditionalDependencies>
avformatd.lib;avcodecd.lib;avutild.lib;avfilterd.lib;libcdio_paranoiad.lib;libsdld.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
avformatd.lib;avcodecd.lib;avutild.lib;avfilterd.lib;libcdio_paranoiad.lib;libsdl
2
d.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<LargeAddressAware>
true
</LargeAddressAware>
<GenerateDebugInformation>
true
</GenerateDebugInformation>
...
...
@@ -708,7 +708,7 @@ echo These errors are the result of dead code elimination not being p
<ProgramDatabaseFile>
$(OutDir)\lib\x64\$(TargetName).pdb
</ProgramDatabaseFile>
<ModuleDefinitionFile>
.\libavdevice.def
</ModuleDefinitionFile>
<ProfileGuidedDatabase>
$(IntDir)\$(TargetName).pgd
</ProfileGuidedDatabase>
<AdditionalDependencies>
avformatd.lib;avcodecd.lib;avutild.lib;avfilterd.lib;libcdio_paranoiad.lib;libsdld.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
avformatd.lib;avcodecd.lib;avutild.lib;avfilterd.lib;libcdio_paranoiad.lib;libsdl
2
d.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<GenerateDebugInformation>
true
</GenerateDebugInformation>
<ForceFileOutput>
UndefinedSymbolOnly
</ForceFileOutput>
...
...
@@ -785,7 +785,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>
libcdio_paranoia.lib;libsdl.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
libcdio_paranoia.lib;libsdl
2
.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<AdditionalOptions>
/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)
</AdditionalOptions>
</Lib>
...
...
@@ -855,7 +855,7 @@ cd $(ProjectDir)
<TargetMachine>
MachineX64
</TargetMachine>
<SubSystem>
Windows
</SubSystem>
<OutputFile>
$(OutDir)\lib\x64\$(TargetName)$(TargetExt)
</OutputFile>
<AdditionalDependencies>
libcdio_paranoia.lib;libsdl.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
libcdio_paranoia.lib;libsdl
2
.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<AdditionalOptions>
/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)
</AdditionalOptions>
</Lib>
...
...
@@ -930,7 +930,7 @@ cd $(ProjectDir)
<ProgramDatabaseFile>
$(OutDir)\lib\x86\$(TargetName).pdb
</ProgramDatabaseFile>
<ModuleDefinitionFile>
.\libavdevice.def
</ModuleDefinitionFile>
<ProfileGuidedDatabase>
$(IntDir)\$(TargetName).pgd
</ProfileGuidedDatabase>
<AdditionalDependencies>
avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;cdio_paranoia.lib;sdl.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;cdio_paranoia.lib;sdl
2
.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.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>
...
...
@@ -1007,7 +1007,7 @@ cd $(ProjectDir)
<ProgramDatabaseFile>
$(OutDir)\lib\x64\$(TargetName).pdb
</ProgramDatabaseFile>
<ModuleDefinitionFile>
.\libavdevice.def
</ModuleDefinitionFile>
<ProfileGuidedDatabase>
$(IntDir)\$(TargetName).pgd
</ProfileGuidedDatabase>
<AdditionalDependencies>
avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;cdio_paranoia.lib;sdl.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;cdio_paranoia.lib;sdl
2
.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.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>
...
...
@@ -1083,7 +1083,7 @@ cd $(ProjectDir)
<ProgramDatabaseFile>
$(OutDir)\lib\x86\$(TargetName).pdb
</ProgramDatabaseFile>
<ModuleDefinitionFile>
.\libavdevice.def
</ModuleDefinitionFile>
<ProfileGuidedDatabase>
$(IntDir)\$(TargetName).pgd
</ProfileGuidedDatabase>
<AdditionalDependencies>
avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;libcdio_paranoia.lib;libsdl.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;libcdio_paranoia.lib;libsdl
2
.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.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>
...
...
@@ -1160,7 +1160,7 @@ cd $(ProjectDir)
<ProgramDatabaseFile>
$(OutDir)\lib\x64\$(TargetName).pdb
</ProgramDatabaseFile>
<ModuleDefinitionFile>
.\libavdevice.def
</ModuleDefinitionFile>
<ProfileGuidedDatabase>
$(IntDir)\$(TargetName).pgd
</ProfileGuidedDatabase>
<AdditionalDependencies>
avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;libcdio_paranoia.lib;libsdl.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;libcdio_paranoia.lib;libsdl
2
.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.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>
...
...
@@ -1231,7 +1231,7 @@ cd $(ProjectDir)
<TargetMachine>
MachineX86
</TargetMachine>
<SubSystem>
Windows
</SubSystem>
<OutputFile>
$(OutDir)\lib\x86\$(TargetName)$(TargetExt)
</OutputFile>
<AdditionalDependencies>
libcdio_paranoia.lib;libsdl.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
libcdio_paranoia.lib;libsdl
2
.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<AdditionalOptions>
/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)
</AdditionalOptions>
</Lib>
...
...
@@ -1301,7 +1301,7 @@ cd $(ProjectDir)
<TargetMachine>
MachineX64
</TargetMachine>
<SubSystem>
Windows
</SubSystem>
<OutputFile>
$(OutDir)\lib\x64\$(TargetName)$(TargetExt)
</OutputFile>
<AdditionalDependencies>
libcdio_paranoia.lib;libsdl.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
libcdio_paranoia.lib;libsdl
2
.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<AdditionalOptions>
/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)
</AdditionalOptions>
</Lib>
...
...
SMP/libavdevice.vcxproj.filters
浏览文件 @
4573ffe6
...
...
@@ -70,7 +70,7 @@
<ClCompile
Include=
"..\libavdevice\opengl_enc.c"
>
<Filter>
Source Files\libavdevice
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavdevice\sdl.c"
>
<ClCompile
Include=
"..\libavdevice\sdl
2
.c"
>
<Filter>
Source Files\libavdevice
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavdevice\vfwcap.c"
>
...
...
SMP/libavfilter.vcxproj
浏览文件 @
4573ffe6
...
...
@@ -258,6 +258,7 @@
<ClCompile
Include=
"..\libavfilter\motion_estimation.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_minterpolate.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_mpdecimate.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_nlmeans.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_nnedi.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_noise.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_null.c"
/>
...
...
SMP/libavfilter.vcxproj.filters
浏览文件 @
4573ffe6
...
...
@@ -594,6 +594,9 @@
<ClCompile
Include=
"..\libavfilter\vf_mpdecimate.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_nlmeans.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_nnedi.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录