Skip to content

F
Ffmpeg

小白菜888 / Ffmpeg

通知 3
Star 0
Fork 0
F
Ffmpeg

体验新版 GitCode，发现更多精彩内容 >>

提交 87b0bf88 编写于 作者: M Matthew Oliver
浏览文件
操作

projects: Update for recent merge/update.

上级 0d2fe6cc
隐藏空白更改
内联 并排
Showing with 28 addition and 29 deletion
SMP/config.h
浏览文件 @ 87b0bf88
/* Automatically generated by SMC project_generate - do not modify! */
/* 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 --toolchain=msvc"
......
SMP/ffmpeg.vcxproj
浏览文件 @ 87b0bf88
......@@ -401,7 +401,6 @@ del ..\libavutil\ffversion.h
<ImportLibrary>$(OutDir)\bin\$(TargetName).lib</ImportLibrary>
<ProgramDatabaseFile>$(OutDir)\bin\$(TargetName).pdb</ProgramDatabaseFile>
<LargeAddressAware>true</LargeAddressAware>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<PreBuildEvent>
<Command>if exist ..\config.h (
......@@ -452,7 +451,6 @@ del ..\libavutil\ffversion.h
<OutputFile>$(OutDir)\bin\$(TargetName)$(TargetExt)</OutputFile>
<ImportLibrary>$(OutDir)\bin\$(TargetName).lib</ImportLibrary>
<ProgramDatabaseFile>$(OutDir)\bin\$(TargetName).pdb</ProgramDatabaseFile>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<PreBuildEvent>
<Command>if exist ..\config.h (
......
SMP/ffplay.vcxproj
浏览文件 @ 87b0bf88
......@@ -380,7 +380,7 @@ del ..\libavutil\ffversion.h
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<FloatingPointModel>Precise</FloatingPointModel>
<AdditionalOptions>/Qvec- /Qsimd- %(AdditionalOptions)</AdditionalOptions>
<InterproceduralOptimization>SingleFile</InterproceduralOptimization>
<InterproceduralOptimization>SingleFile</InterproceduralOptimization>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
......@@ -431,7 +431,7 @@ del ..\libavutil\ffversion.h
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<FloatingPointModel>Precise</FloatingPointModel>
<AdditionalOptions>/Qvec- /Qsimd- %(AdditionalOptions)</AdditionalOptions>
<InterproceduralOptimization>SingleFile</InterproceduralOptimization>
<InterproceduralOptimization>SingleFile</InterproceduralOptimization>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
......@@ -482,7 +482,7 @@ del ..\libavutil\ffversion.h
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<FloatingPointModel>Precise</FloatingPointModel>
<AdditionalOptions>/Qvec- /Qsimd- %(AdditionalOptions)</AdditionalOptions>
<InterproceduralOptimization>SingleFile</InterproceduralOptimization>
<InterproceduralOptimization>SingleFile</InterproceduralOptimization>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
......@@ -533,7 +533,7 @@ del ..\libavutil\ffversion.h
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<FloatingPointModel>Precise</FloatingPointModel>
<AdditionalOptions>/Qvec- /Qsimd- %(AdditionalOptions)</AdditionalOptions>
<InterproceduralOptimization>SingleFile</InterproceduralOptimization>
<InterproceduralOptimization>SingleFile</InterproceduralOptimization>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
......
SMP/ffprobe.vcxproj
浏览文件 @ 87b0bf88
......@@ -380,7 +380,7 @@ del ..\libavutil\ffversion.h
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<FloatingPointModel>Precise</FloatingPointModel>
<AdditionalOptions>/Qvec- /Qsimd- %(AdditionalOptions)</AdditionalOptions>
<InterproceduralOptimization>SingleFile</InterproceduralOptimization>
<InterproceduralOptimization>SingleFile</InterproceduralOptimization>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
......@@ -431,7 +431,7 @@ del ..\libavutil\ffversion.h
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<FloatingPointModel>Precise</FloatingPointModel>
<AdditionalOptions>/Qvec- /Qsimd- %(AdditionalOptions)</AdditionalOptions>
<InterproceduralOptimization>SingleFile</InterproceduralOptimization>
<InterproceduralOptimization>SingleFile</InterproceduralOptimization>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
......@@ -482,7 +482,7 @@ del ..\libavutil\ffversion.h
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<FloatingPointModel>Precise</FloatingPointModel>
<AdditionalOptions>/Qvec- /Qsimd- %(AdditionalOptions)</AdditionalOptions>
<InterproceduralOptimization>SingleFile</InterproceduralOptimization>
<InterproceduralOptimization>SingleFile</InterproceduralOptimization>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
......@@ -533,7 +533,7 @@ del ..\libavutil\ffversion.h
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<FloatingPointModel>Precise</FloatingPointModel>
<AdditionalOptions>/Qvec- /Qsimd- %(AdditionalOptions)</AdditionalOptions>
<InterproceduralOptimization>SingleFile</InterproceduralOptimization>
<InterproceduralOptimization>SingleFile</InterproceduralOptimization>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
......
SMP/libavcodec.vcxproj
浏览文件 @ 87b0bf88
......@@ -2150,6 +2150,9 @@
<ClCompile Include="..\libavcodec\x86\sbrdsp_init.c">
<ObjectFileName>$(IntDir)\libavcodec_x86_sbrdsp_init.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavcodec\x86\pngdsp_init.c">
<ObjectFileName>$(IntDir)\libavcodec_x86_pngdsp_init.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavcodec\x86\cavsdsp.c">
<ObjectFileName>$(IntDir)\libavcodec_x86_cavsdsp.obj</ObjectFileName>
</ClCompile>
......@@ -2168,9 +2171,6 @@
<ClCompile Include="..\libavcodec\x86\xvididct_init.c">
<ObjectFileName>$(IntDir)\libavcodec_x86_xvididct_init.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavcodec\x86\pngdsp_init.c">
<ObjectFileName>$(IntDir)\libavcodec_x86_pngdsp_init.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavcodec\x86\proresdsp_init.c">
<ObjectFileName>$(IntDir)\libavcodec_x86_proresdsp_init.obj</ObjectFileName>
</ClCompile>
......@@ -2183,12 +2183,12 @@
<ClCompile Include="..\libavcodec\x86\svq1enc_init.c">
<ObjectFileName>$(IntDir)\libavcodec_x86_svq1enc_init.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavcodec\x86\v210-init.c">
<ObjectFileName>$(IntDir)\libavcodec_x86_v210-init.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavcodec\x86\ttadsp_init.c">
<ObjectFileName>$(IntDir)\libavcodec_x86_ttadsp_init.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavcodec\x86\v210-init.c">
<ObjectFileName>$(IntDir)\libavcodec_x86_v210-init.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavcodec\x86\vc1dsp_init.c">
<ObjectFileName>$(IntDir)\libavcodec_x86_vc1dsp_init.obj</ObjectFileName>
</ClCompile>
......@@ -2284,13 +2284,13 @@
<YASM Include="..\libavcodec\x86\videodsp.asm" />
<YASM Include="..\libavcodec\x86\vp3dsp.asm" />
<YASM Include="..\libavcodec\x86\sbrdsp.asm" />
<YASM Include="..\libavcodec\x86\pngdsp.asm" />
<YASM Include="..\libavcodec\x86\dcadsp.asm" />
<YASM Include="..\libavcodec\x86\hevc_mc.asm" />
<YASM Include="..\libavcodec\x86\hevc_deblock.asm" />
<YASM Include="..\libavcodec\x86\hevc_idct.asm" />
<YASM Include="..\libavcodec\x86\hevc_res_add.asm" />
<YASM Include="..\libavcodec\x86\mlpdsp.asm" />
<YASM Include="..\libavcodec\x86\pngdsp.asm" />
<YASM Include="..\libavcodec\x86\proresdsp.asm" />
<YASM Include="..\libavcodec\x86\rv34dsp.asm" />
<YASM Include="..\libavcodec\x86\rv40dsp.asm" />
......@@ -2999,7 +2999,7 @@ cd $(ProjectDir)
<TargetMachine>MachineX86</TargetMachine>
<SubSystem>Windows</SubSystem>
<OutputFile>$(OutDir)\lib\$(TargetName)$(TargetExt)</OutputFile>
<AdditionalDependencies>libbz2.lib;libiconv.lib;libfdk-aac.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libx264.lib;libx265.lib;libxvidcore.lib;liblzma.a;libz.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libbz2.lib;libiconv.lib;libfdk-aac.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libx264.lib;libx265.lib;libxvidcore.lib;liblzma.lib;libz.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir)\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
<PostBuildEvent>
......@@ -3077,7 +3077,7 @@ cd $(ProjectDir)
<TargetMachine>MachineX64</TargetMachine>
<SubSystem>Windows</SubSystem>
<OutputFile>$(OutDir)\lib\$(TargetName)$(TargetExt)</OutputFile>
<AdditionalDependencies>libbz2.lib;libiconv.lib;libfdk-aac.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libx264.lib;libx265.lib;libxvidcore.lib;liblzma.a;libz.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libbz2.lib;libiconv.lib;libfdk-aac.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libx264.lib;libx265.lib;libxvidcore.lib;liblzma.lib;libz.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir)\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
<PostBuildEvent>
......
SMP/libavcodec.vcxproj.filters
浏览文件 @ 87b0bf88
......@@ -2112,6 +2112,9 @@
<ClCompile Include="..\libavcodec\x86\sbrdsp_init.c">
<Filter>Source Files\libavcodec\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\x86\pngdsp_init.c">
<Filter>Source Files\libavcodec\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\x86\cavsdsp.c">
<Filter>Source Files\libavcodec\x86</Filter>
</ClCompile>
......@@ -2130,9 +2133,6 @@
<ClCompile Include="..\libavcodec\x86\xvididct_init.c">
<Filter>Source Files\libavcodec\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\x86\pngdsp_init.c">
<Filter>Source Files\libavcodec\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\x86\proresdsp_init.c">
<Filter>Source Files\libavcodec\x86</Filter>
</ClCompile>
......@@ -2145,10 +2145,10 @@
<ClCompile Include="..\libavcodec\x86\svq1enc_init.c">
<Filter>Source Files\libavcodec\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\x86\v210-init.c">
<ClCompile Include="..\libavcodec\x86\ttadsp_init.c">
<Filter>Source Files\libavcodec\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\x86\ttadsp_init.c">
<ClCompile Include="..\libavcodec\x86\v210-init.c">
<Filter>Source Files\libavcodec\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\x86\vc1dsp_init.c">
......@@ -2350,6 +2350,9 @@
<YASM Include="..\libavcodec\x86\sbrdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\pngdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\dcadsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
......@@ -2368,9 +2371,6 @@
<YASM Include="..\libavcodec\x86\mlpdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\pngdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\proresdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
......
SMP/libavutil.def
浏览文件 @ 87b0bf88
......@@ -75,6 +75,7 @@ EXPORTS
av_dict_count
av_dict_free
av_dict_get
av_dict_get_string
av_dict_parse_string
av_dict_set
av_dict_set_int
......
SMP/libavutil/avconfig.h
浏览文件 @ 87b0bf88
/* Automatically generated by SMC project_generate - do not modify! */
/* Automatically generated by SMP project_generate - do not modify! */
#ifndef AVUTIL_AVCONFIG_H
#define AVUTIL_AVCONFIG_H
#define AV_HAVE_BIGENDIAN 0
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或