提交 dc3e3864 编写于 作者: M Matt Oliver

project: Change to use internal rtmp and update for merge.

This means that librtmp is no longer required as ffmpegs internal rtmp
code is now used instead. libgmp is now a direct dependency as it is
used for rtmp crypt functions.
上级 32397e26
......@@ -439,6 +439,8 @@
%define CONFIG_CRYSTALHD 0
%define CONFIG_DECKLINK 0
%define CONFIG_FREI0R 0
%define CONFIG_GCRYPT 0
%define CONFIG_GMP 1
%define CONFIG_GNUTLS 1
%define CONFIG_ICONV 1
%define CONFIG_LADSPA 0
......@@ -474,7 +476,7 @@
%define CONFIG_LIBOPUS 1
%define CONFIG_LIBPULSE 0
%define CONFIG_LIBQUVI 0
%define CONFIG_LIBRTMP 1
%define CONFIG_LIBRTMP 0
%define CONFIG_LIBRUBBERBAND 0
%define CONFIG_LIBSCHROEDINGER 0
%define CONFIG_LIBSHINE 0
......@@ -591,8 +593,6 @@
%define CONFIG_FMTCONVERT 1
%define CONFIG_FRAME_THREAD_ENCODER 1
%define CONFIG_G722DSP 1
%define CONFIG_GCRYPT 1
%define CONFIG_GMP 1
%define CONFIG_GOLOMB 1
%define CONFIG_GPLV3 1
%define CONFIG_H263DSP 1
......@@ -1524,6 +1524,7 @@
%define CONFIG_HEVC_QSV_ENCODER 1
%define CONFIG_LIBKVAZAAR_ENCODER 0
%define CONFIG_MPEG2_QSV_ENCODER 1
%define CONFIG_ACOMPRESSOR_FILTER 1
%define CONFIG_ACROSSFADE_FILTER 1
%define CONFIG_ADELAY_FILTER 1
%define CONFIG_AECHO_FILTER 1
......@@ -1565,6 +1566,7 @@
%define CONFIG_CHANNELSPLIT_FILTER 1
%define CONFIG_CHORUS_FILTER 1
%define CONFIG_COMPAND_FILTER 1
%define CONFIG_COMPENSATIONDELAY_FILTER 1
%define CONFIG_DCSHIFT_FILTER 1
%define CONFIG_DYNAUDNORM_FILTER 1
%define CONFIG_EARWAX_FILTER 1
......@@ -2035,8 +2037,8 @@
%define CONFIG_CONCAT_PROTOCOL 1
%define CONFIG_CRYPTO_PROTOCOL 1
%define CONFIG_DATA_PROTOCOL 1
%define CONFIG_FFRTMPCRYPT_PROTOCOL 0
%define CONFIG_FFRTMPHTTP_PROTOCOL 0
%define CONFIG_FFRTMPCRYPT_PROTOCOL 1
%define CONFIG_FFRTMPHTTP_PROTOCOL 1
%define CONFIG_FILE_PROTOCOL 1
%define CONFIG_FTP_PROTOCOL 1
%define CONFIG_GOPHER_PROTOCOL 1
......@@ -2049,12 +2051,12 @@
%define CONFIG_MMST_PROTOCOL 1
%define CONFIG_MD5_PROTOCOL 1
%define CONFIG_PIPE_PROTOCOL 1
%define CONFIG_RTMP_PROTOCOL 0
%define CONFIG_RTMPE_PROTOCOL 0
%define CONFIG_RTMPS_PROTOCOL 0
%define CONFIG_RTMPT_PROTOCOL 0
%define CONFIG_RTMPTE_PROTOCOL 0
%define CONFIG_RTMPTS_PROTOCOL 0
%define CONFIG_RTMP_PROTOCOL 1
%define CONFIG_RTMPE_PROTOCOL 1
%define CONFIG_RTMPS_PROTOCOL 1
%define CONFIG_RTMPT_PROTOCOL 1
%define CONFIG_RTMPTE_PROTOCOL 1
%define CONFIG_RTMPTS_PROTOCOL 1
%define CONFIG_RTP_PROTOCOL 1
%define CONFIG_SCTP_PROTOCOL 0
%define CONFIG_SRTP_PROTOCOL 1
......@@ -2067,10 +2069,10 @@
%define CONFIG_UDP_PROTOCOL 1
%define CONFIG_UDPLITE_PROTOCOL 1
%define CONFIG_UNIX_PROTOCOL 0
%define CONFIG_LIBRTMP_PROTOCOL 1
%define CONFIG_LIBRTMPE_PROTOCOL 1
%define CONFIG_LIBRTMPS_PROTOCOL 1
%define CONFIG_LIBRTMPT_PROTOCOL 1
%define CONFIG_LIBRTMPTE_PROTOCOL 1
%define CONFIG_LIBRTMP_PROTOCOL 0
%define CONFIG_LIBRTMPE_PROTOCOL 0
%define CONFIG_LIBRTMPS_PROTOCOL 0
%define CONFIG_LIBRTMPT_PROTOCOL 0
%define CONFIG_LIBRTMPTE_PROTOCOL 0
%define CONFIG_LIBSSH_PROTOCOL 1
%define CONFIG_LIBSMBCLIENT_PROTOCOL 0
......@@ -21,7 +21,7 @@
#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 --disable-schannel --enable-librtmp --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-nvenc --enable-libmfx --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 --disable-schannel --enable-gmp --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-nvenc --enable-libmfx --toolchain=msvc"
#define FFMPEG_LICENSE "nonfree and unredistributable"
#define CONFIG_THIS_YEAR 2015
#define FFMPEG_DATADIR "."
......@@ -481,6 +481,8 @@
#define CONFIG_CRYSTALHD 0
#define CONFIG_DECKLINK 0
#define CONFIG_FREI0R 0
#define CONFIG_GCRYPT 0
#define CONFIG_GMP 1
#define CONFIG_GNUTLS 1
#define CONFIG_ICONV 1
#define CONFIG_LADSPA 0
......@@ -516,7 +518,7 @@
#define CONFIG_LIBOPUS 1
#define CONFIG_LIBPULSE 0
#define CONFIG_LIBQUVI 0
#define CONFIG_LIBRTMP 1
#define CONFIG_LIBRTMP 0
#define CONFIG_LIBRUBBERBAND 0
#define CONFIG_LIBSCHROEDINGER 0
#define CONFIG_LIBSHINE 0
......@@ -641,8 +643,6 @@
#define CONFIG_FMTCONVERT 1
#define CONFIG_FRAME_THREAD_ENCODER 1
#define CONFIG_G722DSP 1
#define CONFIG_GCRYPT 1
#define CONFIG_GMP 1
#define CONFIG_GOLOMB 1
#define CONFIG_GPLV3 1
#define CONFIG_H263DSP 1
......@@ -1574,6 +1574,7 @@
#define CONFIG_HEVC_QSV_ENCODER 1
#define CONFIG_LIBKVAZAAR_ENCODER 0
#define CONFIG_MPEG2_QSV_ENCODER 1
#define CONFIG_ACOMPRESSOR_FILTER 1
#define CONFIG_ACROSSFADE_FILTER 1
#define CONFIG_ADELAY_FILTER 1
#define CONFIG_AECHO_FILTER 1
......@@ -1615,6 +1616,7 @@
#define CONFIG_CHANNELSPLIT_FILTER 1
#define CONFIG_CHORUS_FILTER 1
#define CONFIG_COMPAND_FILTER 1
#define CONFIG_COMPENSATIONDELAY_FILTER 1
#define CONFIG_DCSHIFT_FILTER 1
#define CONFIG_DYNAUDNORM_FILTER 1
#define CONFIG_EARWAX_FILTER 1
......@@ -2085,8 +2087,8 @@
#define CONFIG_CONCAT_PROTOCOL 1
#define CONFIG_CRYPTO_PROTOCOL 1
#define CONFIG_DATA_PROTOCOL 1
#define CONFIG_FFRTMPCRYPT_PROTOCOL 0
#define CONFIG_FFRTMPHTTP_PROTOCOL 0
#define CONFIG_FFRTMPCRYPT_PROTOCOL 1
#define CONFIG_FFRTMPHTTP_PROTOCOL 1
#define CONFIG_FILE_PROTOCOL 1
#define CONFIG_FTP_PROTOCOL 1
#define CONFIG_GOPHER_PROTOCOL 1
......@@ -2099,12 +2101,12 @@
#define CONFIG_MMST_PROTOCOL 1
#define CONFIG_MD5_PROTOCOL 1
#define CONFIG_PIPE_PROTOCOL 1
#define CONFIG_RTMP_PROTOCOL 0
#define CONFIG_RTMPE_PROTOCOL 0
#define CONFIG_RTMPS_PROTOCOL 0
#define CONFIG_RTMPT_PROTOCOL 0
#define CONFIG_RTMPTE_PROTOCOL 0
#define CONFIG_RTMPTS_PROTOCOL 0
#define CONFIG_RTMP_PROTOCOL 1
#define CONFIG_RTMPE_PROTOCOL 1
#define CONFIG_RTMPS_PROTOCOL 1
#define CONFIG_RTMPT_PROTOCOL 1
#define CONFIG_RTMPTE_PROTOCOL 1
#define CONFIG_RTMPTS_PROTOCOL 1
#define CONFIG_RTP_PROTOCOL 1
#define CONFIG_SCTP_PROTOCOL 0
#define CONFIG_SRTP_PROTOCOL 1
......@@ -2117,11 +2119,11 @@
#define CONFIG_UDP_PROTOCOL 1
#define CONFIG_UDPLITE_PROTOCOL 1
#define CONFIG_UNIX_PROTOCOL 0
#define CONFIG_LIBRTMP_PROTOCOL 1
#define CONFIG_LIBRTMPE_PROTOCOL 1
#define CONFIG_LIBRTMPS_PROTOCOL 1
#define CONFIG_LIBRTMPT_PROTOCOL 1
#define CONFIG_LIBRTMPTE_PROTOCOL 1
#define CONFIG_LIBRTMP_PROTOCOL 0
#define CONFIG_LIBRTMPE_PROTOCOL 0
#define CONFIG_LIBRTMPS_PROTOCOL 0
#define CONFIG_LIBRTMPT_PROTOCOL 0
#define CONFIG_LIBRTMPTE_PROTOCOL 0
#define CONFIG_LIBSSH_PROTOCOL 1
#define CONFIG_LIBSMBCLIENT_PROTOCOL 0
#endif /* FFMPEG_CONFIG_H */
......@@ -64,10 +64,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libavfilter", "libavfilter.
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libavformat", "libavformat.vcxproj", "{30A96E9B-8061-4F19-BD71-FDE7EA8F7929}"
ProjectSection(ProjectDependencies) = postProject
{02B94302-23D6-43EF-8865-95CDE99D5DC2} = {02B94302-23D6-43EF-8865-95CDE99D5DC2}
{17D28A05-3CF7-4F15-B19C-6495EC7579B8} = {17D28A05-3CF7-4F15-B19C-6495EC7579B8}
{CA9A4A38-CC63-4BDB-8CFB-E058965DDA32} = {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}
{704AB765-90EE-4B99-9887-1B9ECFB7AB70} = {704AB765-90EE-4B99-9887-1B9ECFB7AB70}
{02EB8C66-CEC8-4862-AD01-2CF648DDB433} = {02EB8C66-CEC8-4862-AD01-2CF648DDB433}
{38E671C9-3FE3-40B7-A1AF-D2D566762186} = {38E671C9-3FE3-40B7-A1AF-D2D566762186}
{CE6C44DD-6E38-4293-8AB3-04EE28CCA972} = {CE6C44DD-6E38-4293-8AB3-04EE28CCA972}
{B67554E5-6253-4C94-8BCD-B8F87479970B} = {B67554E5-6253-4C94-8BCD-B8F87479970B}
......@@ -197,15 +197,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg", "..\..\ogg\SMP\lib
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopus", "..\..\opus\SMP\libopus.vcxproj", "{ABBD5F2A-361F-4D4F-A532-01B856C59E9E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librtmp", "..\..\rtmpdump\SMP\librtmp.vcxproj", "{02EB8C66-CEC8-4862-AD01-2CF648DDB433}"
ProjectSection(ProjectDependencies) = postProject
{02B94302-23D6-43EF-8865-95CDE99D5DC2} = {02B94302-23D6-43EF-8865-95CDE99D5DC2}
{070FEF2B-0C3F-4F33-9D3C-53C7330BF518} = {070FEF2B-0C3F-4F33-9D3C-53C7330BF518}
{CA9A4A38-CC63-4BDB-8CFB-E058965DDA32} = {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}
{200F3D3C-8B84-46D8-953A-6C0EBD283B5C} = {200F3D3C-8B84-46D8-953A-6C0EBD283B5C}
{6F610EE8-7F59-4191-AB88-F63843267C02} = {6F610EE8-7F59-4191-AB88-F63843267C02}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsoxr", "..\..\soxr\SMP\libsoxr.vcxproj", "{C3CEF41A-9096-449D-B6B5-0A82A8C3F3C9}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeex", "..\..\speex\SMP\libspeex.vcxproj", "{564B2F86-5CDC-4D58-B869-5E8394CC3298}"
......@@ -1296,34 +1287,6 @@ Global
{ABBD5F2A-361F-4D4F-A532-01B856C59E9E}.ReleaseLTO|Win32.Build.0 = ReleaseLTO|Win32
{ABBD5F2A-361F-4D4F-A532-01B856C59E9E}.ReleaseLTO|x64.ActiveCfg = ReleaseLTO|x64
{ABBD5F2A-361F-4D4F-A532-01B856C59E9E}.ReleaseLTO|x64.Build.0 = ReleaseLTO|x64
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.Debug|Win32.ActiveCfg = Debug|Win32
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.Debug|Win32.Build.0 = Debug|Win32
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.Debug|x64.ActiveCfg = Debug|x64
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.Debug|x64.Build.0 = Debug|x64
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.DebugDLL|Win32.Build.0 = DebugDLL|Win32
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.DebugDLL|x64.ActiveCfg = DebugDLL|x64
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.DebugDLL|x64.Build.0 = DebugDLL|x64
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.DebugDLLStaticDeps|Win32.ActiveCfg = Debug|Win32
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.DebugDLLStaticDeps|Win32.Build.0 = Debug|Win32
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.DebugDLLStaticDeps|x64.ActiveCfg = Debug|x64
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.DebugDLLStaticDeps|x64.Build.0 = Debug|x64
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.Release|Win32.ActiveCfg = Release|Win32
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.Release|Win32.Build.0 = Release|Win32
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.Release|x64.ActiveCfg = Release|x64
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.Release|x64.Build.0 = Release|x64
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.ReleaseDLL|x64.Build.0 = ReleaseDLL|x64
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.ReleaseDLLStaticDeps|Win32.ActiveCfg = Release|Win32
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.ReleaseDLLStaticDeps|Win32.Build.0 = Release|Win32
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.ReleaseDLLStaticDeps|x64.ActiveCfg = Release|x64
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.ReleaseDLLStaticDeps|x64.Build.0 = Release|x64
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.ReleaseLTO|Win32.ActiveCfg = ReleaseLTO|Win32
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.ReleaseLTO|Win32.Build.0 = ReleaseLTO|Win32
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.ReleaseLTO|x64.ActiveCfg = ReleaseLTO|x64
{02EB8C66-CEC8-4862-AD01-2CF648DDB433}.ReleaseLTO|x64.Build.0 = ReleaseLTO|x64
{C3CEF41A-9096-449D-B6B5-0A82A8C3F3C9}.Debug|Win32.ActiveCfg = Debug|Win32
{C3CEF41A-9096-449D-B6B5-0A82A8C3F3C9}.Debug|Win32.Build.0 = Debug|Win32
{C3CEF41A-9096-449D-B6B5-0A82A8C3F3C9}.Debug|x64.ActiveCfg = Debug|x64
......@@ -1758,7 +1721,6 @@ Global
{2016A4DB-B9BA-4521-BDA7-0EB3806E1FC8} = {0823582D-5403-47DA-A2A0-D479D4DED7A3}
{1C2315EC-E08C-4E8F-AD66-917DC9C30B98} = {0823582D-5403-47DA-A2A0-D479D4DED7A3}
{ABBD5F2A-361F-4D4F-A532-01B856C59E9E} = {0823582D-5403-47DA-A2A0-D479D4DED7A3}
{02EB8C66-CEC8-4862-AD01-2CF648DDB433} = {0823582D-5403-47DA-A2A0-D479D4DED7A3}
{C3CEF41A-9096-449D-B6B5-0A82A8C3F3C9} = {0823582D-5403-47DA-A2A0-D479D4DED7A3}
{564B2F86-5CDC-4D58-B869-5E8394CC3298} = {0823582D-5403-47DA-A2A0-D479D4DED7A3}
{0D0F22AE-15B2-414B-9BCC-2D1C2278AA87} = {0823582D-5403-47DA-A2A0-D479D4DED7A3}
......
......@@ -103,6 +103,7 @@
<ClCompile Include="..\libavfilter\opencl_allkernels.c" />
<ClCompile Include="..\libavfilter\transform.c" />
<ClCompile Include="..\libavfilter\video.c" />
<ClCompile Include="..\libavfilter\af_sidechaincompress.c" />
<ClCompile Include="..\libavfilter\af_afade.c" />
<ClCompile Include="..\libavfilter\af_adelay.c" />
<ClCompile Include="..\libavfilter\af_aecho.c" />
......@@ -137,6 +138,7 @@
<ClCompile Include="..\libavfilter\af_channelsplit.c" />
<ClCompile Include="..\libavfilter\af_chorus.c" />
<ClCompile Include="..\libavfilter\af_compand.c" />
<ClCompile Include="..\libavfilter\af_compensationdelay.c" />
<ClCompile Include="..\libavfilter\af_dcshift.c" />
<ClCompile Include="..\libavfilter\af_dynaudnorm.c" />
<ClCompile Include="..\libavfilter\af_earwax.c" />
......@@ -146,7 +148,6 @@
<ClCompile Include="..\libavfilter\af_join.c" />
<ClCompile Include="..\libavfilter\af_pan.c" />
<ClCompile Include="..\libavfilter\af_replaygain.c" />
<ClCompile Include="..\libavfilter\af_sidechaincompress.c" />
<ClCompile Include="..\libavfilter\af_silencedetect.c" />
<ClCompile Include="..\libavfilter\af_silenceremove.c" />
<ClCompile Include="..\libavfilter\af_stereotools.c" />
......
......@@ -129,6 +129,9 @@
<ClCompile Include="..\libavfilter\video.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\af_sidechaincompress.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\af_afade.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
......@@ -231,6 +234,9 @@
<ClCompile Include="..\libavfilter\af_compand.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\af_compensationdelay.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\af_dcshift.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
......@@ -258,9 +264,6 @@
<ClCompile Include="..\libavfilter\af_replaygain.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\af_sidechaincompress.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\af_silencedetect.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
......
......@@ -460,7 +460,6 @@
<ClCompile Include="..\libavformat\yuv4mpegdec.c" />
<ClCompile Include="..\libavformat\libgme.c" />
<ClCompile Include="..\libavformat\libmodplug.c" />
<ClCompile Include="..\libavformat\librtmp.c" />
<ClCompile Include="..\libavformat\libssh.c" />
<ClCompile Include="..\libavformat\async.c" />
<ClCompile Include="..\libavformat\bluray.c" />
......@@ -468,6 +467,9 @@
<ClCompile Include="..\libavformat\concat.c" />
<ClCompile Include="..\libavformat\crypto.c" />
<ClCompile Include="..\libavformat\data_uri.c" />
<ClCompile Include="..\libavformat\rtmpcrypt.c" />
<ClCompile Include="..\libavformat\rtmpdh.c" />
<ClCompile Include="..\libavformat\rtmphttp.c" />
<ClCompile Include="..\libavformat\file.c" />
<ClCompile Include="..\libavformat\ftp.c" />
<ClCompile Include="..\libavformat\gopher.c" />
......@@ -478,6 +480,8 @@
<ClCompile Include="..\libavformat\mms.c" />
<ClCompile Include="..\libavformat\mmst.c" />
<ClCompile Include="..\libavformat\md5proto.c" />
<ClCompile Include="..\libavformat\rtmpproto.c" />
<ClCompile Include="..\libavformat\rtmppkt.c" />
<ClCompile Include="..\libavformat\rtpproto.c" />
<ClCompile Include="..\libavformat\srtpproto.c" />
<ClCompile Include="..\libavformat\subfile.c" />
......@@ -754,7 +758,7 @@
<TargetMachine>MachineX86</TargetMachine>
<SubSystem>Windows</SubSystem>
<OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
<AdditionalDependencies>libbz2d.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;librtmpd.lib;libsshd.lib;libzlibd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libbz2d.lib;libgmpd.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;libsshd.lib;libzlibd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir)\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
</Lib>
......@@ -819,7 +823,7 @@ cd $(ProjectDir)
<TargetMachine>MachineX64</TargetMachine>
<SubSystem>Windows</SubSystem>
<OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
<AdditionalDependencies>libbz2d.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;librtmpd.lib;libsshd.lib;libzlibd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libbz2d.lib;libgmpd.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;libsshd.lib;libzlibd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir)\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
</Lib>
......@@ -887,7 +891,7 @@ cd $(ProjectDir)
<ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
<ModuleDefinitionFile>.\libavformat.def</ModuleDefinitionFile>
<ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
<AdditionalDependencies>avcodecd.lib;avutild.lib;bz2d.lib;gnutlsd.lib;blurayd.lib;gmed.lib;modplugd.lib;rtmpd.lib;sshd.lib;zlibd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>avcodecd.lib;avutild.lib;bz2d.lib;gmpd.lib;gnutlsd.lib;blurayd.lib;gmed.lib;modplugd.lib;sshd.lib;zlibd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir)\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<LargeAddressAware>true</LargeAddressAware>
<GenerateDebugInformation>true</GenerateDebugInformation>
......@@ -963,7 +967,7 @@ echo These errors are the result of dead code elimination not being p
<ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
<ModuleDefinitionFile>.\libavformat.def</ModuleDefinitionFile>
<ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
<AdditionalDependencies>avcodecd.lib;avutild.lib;bz2d.lib;gnutlsd.lib;blurayd.lib;gmed.lib;modplugd.lib;rtmpd.lib;sshd.lib;zlibd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>avcodecd.lib;avutild.lib;bz2d.lib;gmpd.lib;gnutlsd.lib;blurayd.lib;gmed.lib;modplugd.lib;sshd.lib;zlibd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir)\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ForceFileOutput>UndefinedSymbolOnly</ForceFileOutput>
......@@ -1038,7 +1042,7 @@ echo These errors are the result of dead code elimination not being p
<ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
<ModuleDefinitionFile>.\libavformat.def</ModuleDefinitionFile>
<ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
<AdditionalDependencies>avcodecd.lib;avutild.lib;libbz2d.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;librtmpd.lib;libsshd.lib;libzlibd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>avcodecd.lib;avutild.lib;libbz2d.lib;libgmpd.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;libsshd.lib;libzlibd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir)\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<LargeAddressAware>true</LargeAddressAware>
<GenerateDebugInformation>true</GenerateDebugInformation>
......@@ -1114,7 +1118,7 @@ echo These errors are the result of dead code elimination not being p
<ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
<ModuleDefinitionFile>.\libavformat.def</ModuleDefinitionFile>
<ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
<AdditionalDependencies>avcodecd.lib;avutild.lib;libbz2d.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;librtmpd.lib;libsshd.lib;libzlibd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>avcodecd.lib;avutild.lib;libbz2d.lib;libgmpd.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;libsshd.lib;libzlibd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir)\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ForceFileOutput>UndefinedSymbolOnly</ForceFileOutput>
......@@ -1192,7 +1196,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>libbz2.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;librtmp.lib;libssh.lib;libzlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libbz2.lib;libgmp.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libzlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir)\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
</Lib>
......@@ -1263,7 +1267,7 @@ cd $(ProjectDir)
<TargetMachine>MachineX64</TargetMachine>
<SubSystem>Windows</SubSystem>
<OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
<AdditionalDependencies>libbz2.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;librtmp.lib;libssh.lib;libzlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libbz2.lib;libgmp.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libzlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir)\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
</Lib>
......@@ -1339,7 +1343,7 @@ cd $(ProjectDir)
<ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
<ModuleDefinitionFile>.\libavformat.def</ModuleDefinitionFile>
<ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
<AdditionalDependencies>avcodec.lib;avutil.lib;bz2.lib;gnutls.lib;bluray.lib;gme.lib;modplug.lib;rtmp.lib;ssh.lib;zlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>avcodec.lib;avutil.lib;bz2.lib;gmp.lib;gnutls.lib;bluray.lib;gme.lib;modplug.lib;ssh.lib;zlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir)\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<LargeAddressAware>true</LargeAddressAware>
<AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
......@@ -1416,7 +1420,7 @@ cd $(ProjectDir)
<ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
<ModuleDefinitionFile>.\libavformat.def</ModuleDefinitionFile>
<ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
<AdditionalDependencies>avcodec.lib;avutil.lib;bz2.lib;gnutls.lib;bluray.lib;gme.lib;modplug.lib;rtmp.lib;ssh.lib;zlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>avcodec.lib;avutil.lib;bz2.lib;gmp.lib;gnutls.lib;bluray.lib;gme.lib;modplug.lib;ssh.lib;zlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir)\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
</Link>
......@@ -1492,7 +1496,7 @@ cd $(ProjectDir)
<ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
<ModuleDefinitionFile>.\libavformat.def</ModuleDefinitionFile>
<ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
<AdditionalDependencies>avcodec.lib;avutil.lib;libbz2.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;librtmp.lib;libssh.lib;libzlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>avcodec.lib;avutil.lib;libbz2.lib;libgmp.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libzlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir)\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<LargeAddressAware>true</LargeAddressAware>
<AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
......@@ -1569,7 +1573,7 @@ cd $(ProjectDir)
<ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
<ModuleDefinitionFile>.\libavformat.def</ModuleDefinitionFile>
<ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
<AdditionalDependencies>avcodec.lib;avutil.lib;libbz2.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;librtmp.lib;libssh.lib;libzlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>avcodec.lib;avutil.lib;libbz2.lib;libgmp.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libzlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir)\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
</Link>
......@@ -1640,7 +1644,7 @@ cd $(ProjectDir)
<TargetMachine>MachineX86</TargetMachine>
<SubSystem>Windows</SubSystem>
<OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
<AdditionalDependencies>libbz2.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;librtmp.lib;libssh.lib;libzlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libbz2.lib;libgmp.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libzlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir)\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
</Lib>
......@@ -1711,7 +1715,7 @@ cd $(ProjectDir)
<TargetMachine>MachineX64</TargetMachine>
<SubSystem>Windows</SubSystem>
<OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
<AdditionalDependencies>libbz2.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;librtmp.lib;libssh.lib;libzlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libbz2.lib;libgmp.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libzlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir)\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
</Lib>
......
......@@ -1201,9 +1201,6 @@
<ClCompile Include="..\libavformat\libmodplug.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
<ClCompile Include="..\libavformat\librtmp.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
<ClCompile Include="..\libavformat\libssh.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
......@@ -1225,6 +1222,15 @@
<ClCompile Include="..\libavformat\data_uri.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
<ClCompile Include="..\libavformat\rtmpcrypt.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
<ClCompile Include="..\libavformat\rtmpdh.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
<ClCompile Include="..\libavformat\rtmphttp.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
<ClCompile Include="..\libavformat\file.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
......@@ -1255,6 +1261,12 @@
<ClCompile Include="..\libavformat\md5proto.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
<ClCompile Include="..\libavformat\rtmpproto.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
<ClCompile Include="..\libavformat\rtmppkt.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
<ClCompile Include="..\libavformat\rtpproto.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
......
cd project_generate\bin
project_generate.exe --enable-gpl --enable-version3 --enable-avisynth --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --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 --disable-schannel --enable-librtmp --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-libmfx --toolchain=msvc
\ No newline at end of file
project_generate.exe --enable-gpl --enable-version3 --enable-avisynth --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --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 --disable-schannel --enable-gmp --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-libmfx --toolchain=msvc
\ No newline at end of file
cd project_generate\bin
project_generate.exe --enable-version3 --enable-avisynth --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --enable-libtheora --enable-libvpx --enable-libgme --enable-libmodplug --enable-libsoxr --enable-libfreetype --enable-fontconfig --enable-libfribidi --enable-libass --enable-gnutls --disable-schannel --enable-librtmp --enable-libssh --enable-libbluray --enable-opengl --enable-libmfx --toolchain=msvc
\ No newline at end of file
project_generate.exe --enable-version3 --enable-avisynth --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --enable-libtheora --enable-libvpx --enable-libgme --enable-libmodplug --enable-libsoxr --enable-libfreetype --enable-fontconfig --enable-libfribidi --enable-libass --enable-gnutls --disable-schannel --enable-gmp --enable-libssh --enable-libbluray --enable-opengl --enable-libmfx --toolchain=msvc
\ No newline at end of file
cd project_generate\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 --disable-schannel --enable-librtmp --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-nvenc --enable-libmfx --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 --disable-schannel --enable-gmp --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-nvenc --enable-libmfx --toolchain=msvc
\ No newline at end of file
......@@ -9,6 +9,7 @@ fontconfig, ^
freetype2, ^
fribidi, ^
game-music-emu, ^
gmp, ^
gnutls, ^
lame, ^
libass, ^
......@@ -23,7 +24,6 @@ libvpx, ^
mfx_dispatch, ^
modplug, ^
opus, ^
rtmpdump, ^
sdl, ^
soxr, ^
speex, ^
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册