Skip to content

F
Ffmpeg

小白菜888 / Ffmpeg

通知 3
Star 0
Fork 0
F
Ffmpeg

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

提交 fe4085f0 编写于 作者: M Matt Oliver
浏览文件
操作

project: Update for recent upstream merge.

上级 70a59529
展开全部 隐藏空白更改
内联 并排
Showing with 645 addition and 3718 deletion
SMP/compat.h
浏览文件 @ fe4085f0
......@@ -35,6 +35,11 @@
# define strtod avpriv_strtod
# define strtoll _strtoi64
# endif
# include <sdkddkver.h>
# if defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_PC_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP)
# include <stdlib.h>
# define getenv(x) NULL
# endif
#endif
#endif /* SMP_COMPAT_H */
SMP/config.asm
浏览文件 @ fe4085f0
......@@ -699,6 +699,7 @@
%define CONFIG_WMA_FREQS 1
%define CONFIG_WMV2DSP 1
%define CONFIG_AAC_ADTSTOASC_BSF 1
%define CONFIG_AV1_FRAME_SPLIT_BSF 1
%define CONFIG_AV1_METADATA_BSF 1
%define CONFIG_CHOMP_BSF 1
%define CONFIG_DUMP_EXTRADATA_BSF 1
......@@ -733,6 +734,7 @@
%define CONFIG_AASC_DECODER 1
%define CONFIG_AIC_DECODER 1
%define CONFIG_ALIAS_PIX_DECODER 1
%define CONFIG_AGM_DECODER 1
%define CONFIG_AMV_DECODER 1
%define CONFIG_ANM_DECODER 1
%define CONFIG_ANSI_DECODER 1
......@@ -841,6 +843,7 @@
%define CONFIG_KMVC_DECODER 1
%define CONFIG_LAGARITH_DECODER 1
%define CONFIG_LOCO_DECODER 1
%define CONFIG_LSCR_DECODER 1
%define CONFIG_M101_DECODER 1
%define CONFIG_MAGICYUV_DECODER 1
%define CONFIG_MDEC_DECODER 1
......@@ -1129,6 +1132,7 @@
%define CONFIG_ADPCM_4XM_DECODER 1
%define CONFIG_ADPCM_ADX_DECODER 1
%define CONFIG_ADPCM_AFC_DECODER 1
%define CONFIG_ADPCM_AGM_DECODER 1
%define CONFIG_ADPCM_AICA_DECODER 1
%define CONFIG_ADPCM_CT_DECODER 1
%define CONFIG_ADPCM_DTK_DECODER 1
......@@ -2120,6 +2124,7 @@
%define CONFIG_IVR_DEMUXER 1
%define CONFIG_JACOSUB_DEMUXER 1
%define CONFIG_JV_DEMUXER 1
%define CONFIG_KUX_DEMUXER 1
%define CONFIG_LMLM4_DEMUXER 1
%define CONFIG_LOAS_DEMUXER 1
%define CONFIG_LRC_DEMUXER 1
......
SMP/config.h
浏览文件 @ fe4085f0
......@@ -21,6 +21,10 @@
#ifndef SMP_CONFIG_H
#define SMP_CONFIG_H
#ifdef _WIN32
# include <sdkddkver.h>
# include <winapifamily.h>
#endif
#define FFMPEG_CONFIGURATION "--enable-gpl --enable-version3 --enable-bzlib --enable-iconv --enable-lzma --enable-sdl2 --enable-zlib --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-libxml2 --enable-gnutls --disable-schannel --enable-gcrypt --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-libmfx --enable-ffnvcodec --enable-cuda --enable-amf --toolchain=msvc"
#define FFMPEG_LICENSE "GPL version 3 or later"
#define CONFIG_THIS_YEAR 2019
......@@ -72,10 +76,10 @@
#define ARCH_TILEPRO 0
#define ARCH_TOMI 0
#define ARCH_X86 1
#if defined(__x86_64) || defined(_M_X64)
# define ARCH_X86_32 0
#else
#if !defined(__x86_64) && !defined(_M_X64)
# define ARCH_X86_32 1
#else
# define ARCH_X86_32 0
#endif
#if defined(__x86_64) || defined(_M_X64)
# define ARCH_X86_64 1
......@@ -340,7 +344,11 @@
#define HAVE_GETADDRINFO 1
#define HAVE_GETHRTIME 0
#define HAVE_GETOPT 0
#define HAVE_GETPROCESSAFFINITYMASK 1
#if defined(NTDDI_WIN10_RS3)
# define HAVE_GETPROCESSAFFINITYMASK 1
#else
# define HAVE_GETPROCESSAFFINITYMASK 0
#endif
#define HAVE_GETPROCESSMEMORYINFO 1
#define HAVE_GETPROCESSTIMES 1
#define HAVE_GETRUSAGE 0
......@@ -590,9 +598,6 @@
#define CONFIG_CRYSTALHD 0
#define CONFIG_CUDA 1
#define CONFIG_CUVID 1
#ifdef _WIN32
#include <sdkddkver.h>
#endif
#if defined(NTDDI_WIN8)
# define CONFIG_D3D11VA 1
#else
......@@ -619,10 +624,10 @@
# define CONFIG_SHARED 0
#endif
#define CONFIG_SMALL 0
#if defined(_USRDLL) || defined(_WINDLL)
# define CONFIG_STATIC 0
#else
#if !defined(_USRDLL) && !defined(_WINDLL)
# define CONFIG_STATIC 1
#else
# define CONFIG_STATIC 0
#endif
#define CONFIG_SWSCALE_ALPHA 1
#define CONFIG_GPL 1
......@@ -764,6 +769,7 @@
#define CONFIG_WMA_FREQS 1
#define CONFIG_WMV2DSP 1
#define CONFIG_AAC_ADTSTOASC_BSF 1
#define CONFIG_AV1_FRAME_SPLIT_BSF 1
#define CONFIG_AV1_METADATA_BSF 1
#define CONFIG_CHOMP_BSF 1
#define CONFIG_DUMP_EXTRADATA_BSF 1
......@@ -798,6 +804,7 @@
#define CONFIG_AASC_DECODER 1
#define CONFIG_AIC_DECODER 1
#define CONFIG_ALIAS_PIX_DECODER 1
#define CONFIG_AGM_DECODER 1
#define CONFIG_AMV_DECODER 1
#define CONFIG_ANM_DECODER 1
#define CONFIG_ANSI_DECODER 1
......@@ -906,6 +913,7 @@
#define CONFIG_KMVC_DECODER 1
#define CONFIG_LAGARITH_DECODER 1
#define CONFIG_LOCO_DECODER 1
#define CONFIG_LSCR_DECODER 1
#define CONFIG_M101_DECODER 1
#define CONFIG_MAGICYUV_DECODER 1
#define CONFIG_MDEC_DECODER 1
......@@ -1194,6 +1202,7 @@
#define CONFIG_ADPCM_4XM_DECODER 1
#define CONFIG_ADPCM_ADX_DECODER 1
#define CONFIG_ADPCM_AFC_DECODER 1
#define CONFIG_ADPCM_AGM_DECODER 1
#define CONFIG_ADPCM_AICA_DECODER 1
#define CONFIG_ADPCM_CT_DECODER 1
#define CONFIG_ADPCM_DTK_DECODER 1
......@@ -1596,25 +1605,16 @@
#define CONFIG_VC1_VDPAU_HWACCEL 0
#define CONFIG_VP8_NVDEC_HWACCEL 1
#define CONFIG_VP8_VAAPI_HWACCEL 0
#ifdef _WIN32
#include <sdkddkver.h>
#endif
#if defined(NTDDI_WIN10_TH2)
# define CONFIG_VP9_D3D11VA_HWACCEL 1
#else
# define CONFIG_VP9_D3D11VA_HWACCEL 0
#endif
#ifdef _WIN32
#include <sdkddkver.h>
#endif
#if defined(NTDDI_WIN10_TH2)
# define CONFIG_VP9_D3D11VA2_HWACCEL 1
#else
# define CONFIG_VP9_D3D11VA2_HWACCEL 0
#endif
#ifdef _WIN32
#include <sdkddkver.h>
#endif
#if defined(NTDDI_WIN10_TH2)
# define CONFIG_VP9_DXVA2_HWACCEL 1
#else
......@@ -2246,6 +2246,7 @@
#define CONFIG_IVR_DEMUXER 1
#define CONFIG_JACOSUB_DEMUXER 1
#define CONFIG_JV_DEMUXER 1
#define CONFIG_KUX_DEMUXER 1
#define CONFIG_LMLM4_DEMUXER 1
#define CONFIG_LOAS_DEMUXER 1
#define CONFIG_LRC_DEMUXER 1
......
SMP/ffmpeg.sln
浏览文件 @ fe4085f0
......@@ -94,20 +94,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86
Debug|x64 = Debug|x64
DebugDLL|x86 = DebugDLL|x86
Debug|x86 = Debug|x86
DebugDLL|x64 = DebugDLL|x64
DebugDLLStaticDeps|x86 = DebugDLLStaticDeps|x86
DebugDLLStaticDeps|x64 = DebugDLLStaticDeps|x64
Release|x86 = Release|x86
DebugDLL|x86 = DebugDLL|x86
Release|x64 = Release|x64
ReleaseDLL|x86 = ReleaseDLL|x86
Release|x86 = Release|x86
ReleaseDLL|x64 = ReleaseDLL|x64
ReleaseDLLStaticDeps|x86 = ReleaseDLLStaticDeps|x86
ReleaseDLL|x86 = ReleaseDLL|x86
ReleaseDLLStaticDeps|x64 = ReleaseDLLStaticDeps|x64
ReleaseLTO|x86 = ReleaseLTO|x86
ReleaseLTO|x64 = ReleaseLTO|x64
ReleaseDLLStaticDeps|x86 = ReleaseDLLStaticDeps|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B4824EFF-C340-425D-A4A8-E2E02A71A7AE}.Debug|x86.ActiveCfg = Debug|Win32
......@@ -118,10 +114,6 @@ Global
{B4824EFF-C340-425D-A4A8-E2E02A71A7AE}.DebugDLL|x86.Build.0 = DebugDLL|Win32
{B4824EFF-C340-425D-A4A8-E2E02A71A7AE}.DebugDLL|x64.ActiveCfg = DebugDLL|x64
{B4824EFF-C340-425D-A4A8-E2E02A71A7AE}.DebugDLL|x64.Build.0 = DebugDLL|x64
{B4824EFF-C340-425D-A4A8-E2E02A71A7AE}.DebugDLLStaticDeps|x86.ActiveCfg = DebugDLLStaticDeps|Win32
{B4824EFF-C340-425D-A4A8-E2E02A71A7AE}.DebugDLLStaticDeps|x86.Build.0 = DebugDLLStaticDeps|Win32
{B4824EFF-C340-425D-A4A8-E2E02A71A7AE}.DebugDLLStaticDeps|x64.ActiveCfg = DebugDLLStaticDeps|x64
{B4824EFF-C340-425D-A4A8-E2E02A71A7AE}.DebugDLLStaticDeps|x64.Build.0 = DebugDLLStaticDeps|x64
{B4824EFF-C340-425D-A4A8-E2E02A71A7AE}.Release|x86.ActiveCfg = Release|Win32
{B4824EFF-C340-425D-A4A8-E2E02A71A7AE}.Release|x86.Build.0 = Release|Win32
{B4824EFF-C340-425D-A4A8-E2E02A71A7AE}.Release|x64.ActiveCfg = Release|x64
......@@ -134,10 +126,6 @@ Global
{B4824EFF-C340-425D-A4A8-E2E02A71A7AE}.ReleaseDLLStaticDeps|x86.Build.0 = ReleaseDLLStaticDeps|Win32
{B4824EFF-C340-425D-A4A8-E2E02A71A7AE}.ReleaseDLLStaticDeps|x64.ActiveCfg = ReleaseDLLStaticDeps|x64
{B4824EFF-C340-425D-A4A8-E2E02A71A7AE}.ReleaseDLLStaticDeps|x64.Build.0 = ReleaseDLLStaticDeps|x64
{B4824EFF-C340-425D-A4A8-E2E02A71A7AE}.ReleaseLTO|x86.ActiveCfg = ReleaseLTO|Win32
{B4824EFF-C340-425D-A4A8-E2E02A71A7AE}.ReleaseLTO|x86.Build.0 = ReleaseLTO|Win32
{B4824EFF-C340-425D-A4A8-E2E02A71A7AE}.ReleaseLTO|x64.ActiveCfg = ReleaseLTO|x64
{B4824EFF-C340-425D-A4A8-E2E02A71A7AE}.ReleaseLTO|x64.Build.0 = ReleaseLTO|x64
{6E165FA4-44EB-4330-8394-9F0D76D8E03E}.Debug|x86.ActiveCfg = Debug|Win32
{6E165FA4-44EB-4330-8394-9F0D76D8E03E}.Debug|x86.Build.0 = Debug|Win32
{6E165FA4-44EB-4330-8394-9F0D76D8E03E}.Debug|x64.ActiveCfg = Debug|x64
......@@ -146,10 +134,6 @@ Global
{6E165FA4-44EB-4330-8394-9F0D76D8E03E}.DebugDLL|x86.Build.0 = DebugDLL|Win32
{6E165FA4-44EB-4330-8394-9F0D76D8E03E}.DebugDLL|x64.ActiveCfg = DebugDLL|x64
{6E165FA4-44EB-4330-8394-9F0D76D8E03E}.DebugDLL|x64.Build.0 = DebugDLL|x64
{6E165FA4-44EB-4330-8394-9F0D76D8E03E}.DebugDLLStaticDeps|x86.ActiveCfg = DebugDLLStaticDeps|Win32
{6E165FA4-44EB-4330-8394-9F0D76D8E03E}.DebugDLLStaticDeps|x86.Build.0 = DebugDLLStaticDeps|Win32
{6E165FA4-44EB-4330-8394-9F0D76D8E03E}.DebugDLLStaticDeps|x64.ActiveCfg = DebugDLLStaticDeps|x64
{6E165FA4-44EB-4330-8394-9F0D76D8E03E}.DebugDLLStaticDeps|x64.Build.0 = DebugDLLStaticDeps|x64
{6E165FA4-44EB-4330-8394-9F0D76D8E03E}.Release|x86.ActiveCfg = Release|Win32
{6E165FA4-44EB-4330-8394-9F0D76D8E03E}.Release|x86.Build.0 = Release|Win32
{6E165FA4-44EB-4330-8394-9F0D76D8E03E}.Release|x64.ActiveCfg = Release|x64
......@@ -162,10 +146,6 @@ Global
{6E165FA4-44EB-4330-8394-9F0D76D8E03E}.ReleaseDLLStaticDeps|x86.Build.0 = ReleaseDLLStaticDeps|Win32
{6E165FA4-44EB-4330-8394-9F0D76D8E03E}.ReleaseDLLStaticDeps|x64.ActiveCfg = ReleaseDLLStaticDeps|x64
{6E165FA4-44EB-4330-8394-9F0D76D8E03E}.ReleaseDLLStaticDeps|x64.Build.0 = ReleaseDLLStaticDeps|x64
{6E165FA4-44EB-4330-8394-9F0D76D8E03E}.ReleaseLTO|x86.ActiveCfg = ReleaseLTO|Win32
{6E165FA4-44EB-4330-8394-9F0D76D8E03E}.ReleaseLTO|x86.Build.0 = ReleaseLTO|Win32
{6E165FA4-44EB-4330-8394-9F0D76D8E03E}.ReleaseLTO|x64.ActiveCfg = ReleaseLTO|x64
{6E165FA4-44EB-4330-8394-9F0D76D8E03E}.ReleaseLTO|x64.Build.0 = ReleaseLTO|x64
{BC2E1028-66CD-41A0-AF90-EEBD8CC52787}.Debug|x86.ActiveCfg = Debug|Win32
{BC2E1028-66CD-41A0-AF90-EEBD8CC52787}.Debug|x86.Build.0 = Debug|Win32
{BC2E1028-66CD-41A0-AF90-EEBD8CC52787}.Debug|x64.ActiveCfg = Debug|x64
......@@ -174,10 +154,6 @@ Global
{BC2E1028-66CD-41A0-AF90-EEBD8CC52787}.DebugDLL|x86.Build.0 = DebugDLL|Win32
{BC2E1028-66CD-41A0-AF90-EEBD8CC52787}.DebugDLL|x64.ActiveCfg = DebugDLL|x64
{BC2E1028-66CD-41A0-AF90-EEBD8CC52787}.DebugDLL|x64.Build.0 = DebugDLL|x64
{BC2E1028-66CD-41A0-AF90-EEBD8CC52787}.DebugDLLStaticDeps|x86.ActiveCfg = DebugDLLStaticDeps|Win32
{BC2E1028-66CD-41A0-AF90-EEBD8CC52787}.DebugDLLStaticDeps|x86.Build.0 = DebugDLLStaticDeps|Win32
{BC2E1028-66CD-41A0-AF90-EEBD8CC52787}.DebugDLLStaticDeps|x64.ActiveCfg = DebugDLLStaticDeps|x64
{BC2E1028-66CD-41A0-AF90-EEBD8CC52787}.DebugDLLStaticDeps|x64.Build.0 = DebugDLLStaticDeps|x64
{BC2E1028-66CD-41A0-AF90-EEBD8CC52787}.Release|x86.ActiveCfg = Release|Win32
{BC2E1028-66CD-41A0-AF90-EEBD8CC52787}.Release|x86.Build.0 = Release|Win32
{BC2E1028-66CD-41A0-AF90-EEBD8CC52787}.Release|x64.ActiveCfg = Release|x64
......@@ -190,10 +166,6 @@ Global
{BC2E1028-66CD-41A0-AF90-EEBD8CC52787}.ReleaseDLLStaticDeps|x86.Build.0 = ReleaseDLLStaticDeps|Win32
{BC2E1028-66CD-41A0-AF90-EEBD8CC52787}.ReleaseDLLStaticDeps|x64.ActiveCfg = ReleaseDLLStaticDeps|x64
{BC2E1028-66CD-41A0-AF90-EEBD8CC52787}.ReleaseDLLStaticDeps|x64.Build.0 = ReleaseDLLStaticDeps|x64
{BC2E1028-66CD-41A0-AF90-EEBD8CC52787}.ReleaseLTO|x86.ActiveCfg = ReleaseLTO|Win32
{BC2E1028-66CD-41A0-AF90-EEBD8CC52787}.ReleaseLTO|x86.Build.0 = ReleaseLTO|Win32
{BC2E1028-66CD-41A0-AF90-EEBD8CC52787}.ReleaseLTO|x64.ActiveCfg = ReleaseLTO|x64
{BC2E1028-66CD-41A0-AF90-EEBD8CC52787}.ReleaseLTO|x64.Build.0 = ReleaseLTO|x64
{30A96E9B-8061-4F19-BD71-FDE7EA8F7929}.Debug|x86.ActiveCfg = Debug|Win32
{30A96E9B-8061-4F19-BD71-FDE7EA8F7929}.Debug|x86.Build.0 = Debug|Win32
{30A96E9B-8061-4F19-BD71-FDE7EA8F7929}.Debug|x64.ActiveCfg = Debug|x64
......@@ -202,10 +174,6 @@ Global
{30A96E9B-8061-4F19-BD71-FDE7EA8F7929}.DebugDLL|x86.Build.0 = DebugDLL|Win32
{30A96E9B-8061-4F19-BD71-FDE7EA8F7929}.DebugDLL|x64.ActiveCfg = DebugDLL|x64
{30A96E9B-8061-4F19-BD71-FDE7EA8F7929}.DebugDLL|x64.Build.0 = DebugDLL|x64
{30A96E9B-8061-4F19-BD71-FDE7EA8F7929}.DebugDLLStaticDeps|x86.ActiveCfg = DebugDLLStaticDeps|Win32
{30A96E9B-8061-4F19-BD71-FDE7EA8F7929}.DebugDLLStaticDeps|x86.Build.0 = DebugDLLStaticDeps|Win32
{30A96E9B-8061-4F19-BD71-FDE7EA8F7929}.DebugDLLStaticDeps|x64.ActiveCfg = DebugDLLStaticDeps|x64
{30A96E9B-8061-4F19-BD71-FDE7EA8F7929}.DebugDLLStaticDeps|x64.Build.0 = DebugDLLStaticDeps|x64
{30A96E9B-8061-4F19-BD71-FDE7EA8F7929}.Release|x86.ActiveCfg = Release|Win32
{30A96E9B-8061-4F19-BD71-FDE7EA8F7929}.Release|x86.Build.0 = Release|Win32
{30A96E9B-8061-4F19-BD71-FDE7EA8F7929}.Release|x64.ActiveCfg = Release|x64
......@@ -218,10 +186,6 @@ Global
{30A96E9B-8061-4F19-BD71-FDE7EA8F7929}.ReleaseDLLStaticDeps|x86.Build.0 = ReleaseDLLStaticDeps|Win32
{30A96E9B-8061-4F19-BD71-FDE7EA8F7929}.ReleaseDLLStaticDeps|x64.ActiveCfg = ReleaseDLLStaticDeps|x64
{30A96E9B-8061-4F19-BD71-FDE7EA8F7929}.ReleaseDLLStaticDeps|x64.Build.0 = ReleaseDLLStaticDeps|x64
{30A96E9B-8061-4F19-BD71-FDE7EA8F7929}.ReleaseLTO|x86.ActiveCfg = ReleaseLTO|Win32
{30A96E9B-8061-4F19-BD71-FDE7EA8F7929}.ReleaseLTO|x86.Build.0 = ReleaseLTO|Win32
{30A96E9B-8061-4F19-BD71-FDE7EA8F7929}.ReleaseLTO|x64.ActiveCfg = ReleaseLTO|x64
{30A96E9B-8061-4F19-BD71-FDE7EA8F7929}.ReleaseLTO|x64.Build.0 = ReleaseLTO|x64
{CE6C44DD-6E38-4293-8AB3-04EE28CCA972}.Debug|x86.ActiveCfg = Debug|Win32
{CE6C44DD-6E38-4293-8AB3-04EE28CCA972}.Debug|x86.Build.0 = Debug|Win32
{CE6C44DD-6E38-4293-8AB3-04EE28CCA972}.Debug|x64.ActiveCfg = Debug|x64
......@@ -230,10 +194,6 @@ Global
{CE6C44DD-6E38-4293-8AB3-04EE28CCA972}.DebugDLL|x86.Build.0 = DebugDLL|Win32
{CE6C44DD-6E38-4293-8AB3-04EE28CCA972}.DebugDLL|x64.ActiveCfg = DebugDLL|x64
{CE6C44DD-6E38-4293-8AB3-04EE28CCA972}.DebugDLL|x64.Build.0 = DebugDLL|x64
{CE6C44DD-6E38-4293-8AB3-04EE28CCA972}.DebugDLLStaticDeps|x86.ActiveCfg = DebugDLLStaticDeps|Win32
{CE6C44DD-6E38-4293-8AB3-04EE28CCA972}.DebugDLLStaticDeps|x86.Build.0 = DebugDLLStaticDeps|Win32
{CE6C44DD-6E38-4293-8AB3-04EE28CCA972}.DebugDLLStaticDeps|x64.ActiveCfg = DebugDLLStaticDeps|x64
{CE6C44DD-6E38-4293-8AB3-04EE28CCA972}.DebugDLLStaticDeps|x64.Build.0 = DebugDLLStaticDeps|x64
{CE6C44DD-6E38-4293-8AB3-04EE28CCA972}.Release|x86.ActiveCfg = Release|Win32
{CE6C44DD-6E38-4293-8AB3-04EE28CCA972}.Release|x86.Build.0 = Release|Win32
{CE6C44DD-6E38-4293-8AB3-04EE28CCA972}.Release|x64.ActiveCfg = Release|x64
......@@ -246,10 +206,6 @@ Global
{CE6C44DD-6E38-4293-8AB3-04EE28CCA972}.ReleaseDLLStaticDeps|x86.Build.0 = ReleaseDLLStaticDeps|Win32
{CE6C44DD-6E38-4293-8AB3-04EE28CCA972}.ReleaseDLLStaticDeps|x64.ActiveCfg = ReleaseDLLStaticDeps|x64
{CE6C44DD-6E38-4293-8AB3-04EE28CCA972}.ReleaseDLLStaticDeps|x64.Build.0 = ReleaseDLLStaticDeps|x64
{CE6C44DD-6E38-4293-8AB3-04EE28CCA972}.ReleaseLTO|x86.ActiveCfg = ReleaseLTO|Win32
{CE6C44DD-6E38-4293-8AB3-04EE28CCA972}.ReleaseLTO|x86.Build.0 = ReleaseLTO|Win32
{CE6C44DD-6E38-4293-8AB3-04EE28CCA972}.ReleaseLTO|x64.ActiveCfg = ReleaseLTO|x64
{CE6C44DD-6E38-4293-8AB3-04EE28CCA972}.ReleaseLTO|x64.Build.0 = ReleaseLTO|x64
{4D9C457D-9ADA-4A12-9D06-42D80124C5AB}.Debug|x86.ActiveCfg = Debug|Win32
{4D9C457D-9ADA-4A12-9D06-42D80124C5AB}.Debug|x86.Build.0 = Debug|Win32
{4D9C457D-9ADA-4A12-9D06-42D80124C5AB}.Debug|x64.ActiveCfg = Debug|x64
......@@ -258,10 +214,6 @@ Global
{4D9C457D-9ADA-4A12-9D06-42D80124C5AB}.DebugDLL|x86.Build.0 = DebugDLL|Win32
{4D9C457D-9ADA-4A12-9D06-42D80124C5AB}.DebugDLL|x64.ActiveCfg = DebugDLL|x64
{4D9C457D-9ADA-4A12-9D06-42D80124C5AB}.DebugDLL|x64.Build.0 = DebugDLL|x64
{4D9C457D-9ADA-4A12-9D06-42D80124C5AB}.DebugDLLStaticDeps|x86.ActiveCfg = DebugDLLStaticDeps|Win32
{4D9C457D-9ADA-4A12-9D06-42D80124C5AB}.DebugDLLStaticDeps|x86.Build.0 = DebugDLLStaticDeps|Win32
{4D9C457D-9ADA-4A12-9D06-42D80124C5AB}.DebugDLLStaticDeps|x64.ActiveCfg = DebugDLLStaticDeps|x64
{4D9C457D-9ADA-4A12-9D06-42D80124C5AB}.DebugDLLStaticDeps|x64.Build.0 = DebugDLLStaticDeps|x64
{4D9C457D-9ADA-4A12-9D06-42D80124C5AB}.Release|x86.ActiveCfg = Release|Win32
{4D9C457D-9ADA-4A12-9D06-42D80124C5AB}.Release|x86.Build.0 = Release|Win32
{4D9C457D-9ADA-4A12-9D06-42D80124C5AB}.Release|x64.ActiveCfg = Release|x64
......@@ -274,10 +226,6 @@ Global
{4D9C457D-9ADA-4A12-9D06-42D80124C5AB}.ReleaseDLLStaticDeps|x86.Build.0 = ReleaseDLLStaticDeps|Win32
{4D9C457D-9ADA-4A12-9D06-42D80124C5AB}.ReleaseDLLStaticDeps|x64.ActiveCfg = ReleaseDLLStaticDeps|x64
{4D9C457D-9ADA-4A12-9D06-42D80124C5AB}.ReleaseDLLStaticDeps|x64.Build.0 = ReleaseDLLStaticDeps|x64
{4D9C457D-9ADA-4A12-9D06-42D80124C5AB}.ReleaseLTO|x86.ActiveCfg = ReleaseLTO|Win32
{4D9C457D-9ADA-4A12-9D06-42D80124C5AB}.ReleaseLTO|x86.Build.0 = ReleaseLTO|Win32
{4D9C457D-9ADA-4A12-9D06-42D80124C5AB}.ReleaseLTO|x64.ActiveCfg = ReleaseLTO|x64
{4D9C457D-9ADA-4A12-9D06-42D80124C5AB}.ReleaseLTO|x64.Build.0 = ReleaseLTO|x64
{3CE4A9EF-98B6-4454-B76E-3AD9C03A2114}.Debug|x86.ActiveCfg = Debug|Win32
{3CE4A9EF-98B6-4454-B76E-3AD9C03A2114}.Debug|x86.Build.0 = Debug|Win32
{3CE4A9EF-98B6-4454-B76E-3AD9C03A2114}.Debug|x64.ActiveCfg = Debug|x64
......@@ -286,10 +234,6 @@ Global
{3CE4A9EF-98B6-4454-B76E-3AD9C03A2114}.DebugDLL|x86.Build.0 = DebugDLL|Win32
{3CE4A9EF-98B6-4454-B76E-3AD9C03A2114}.DebugDLL|x64.ActiveCfg = DebugDLL|x64
{3CE4A9EF-98B6-4454-B76E-3AD9C03A2114}.DebugDLL|x64.Build.0 = DebugDLL|x64
{3CE4A9EF-98B6-4454-B76E-3AD9C03A2114}.DebugDLLStaticDeps|x86.ActiveCfg = DebugDLLStaticDeps|Win32
{3CE4A9EF-98B6-4454-B76E-3AD9C03A2114}.DebugDLLStaticDeps|x86.Build.0 = DebugDLLStaticDeps|Win32
{3CE4A9EF-98B6-4454-B76E-3AD9C03A2114}.DebugDLLStaticDeps|x64.ActiveCfg = DebugDLLStaticDeps|x64
{3CE4A9EF-98B6-4454-B76E-3AD9C03A2114}.DebugDLLStaticDeps|x64.Build.0 = DebugDLLStaticDeps|x64
{3CE4A9EF-98B6-4454-B76E-3AD9C03A2114}.Release|x86.ActiveCfg = Release|Win32
{3CE4A9EF-98B6-4454-B76E-3AD9C03A2114}.Release|x86.Build.0 = Release|Win32
{3CE4A9EF-98B6-4454-B76E-3AD9C03A2114}.Release|x64.ActiveCfg = Release|x64
......@@ -302,10 +246,6 @@ Global
{3CE4A9EF-98B6-4454-B76E-3AD9C03A2114}.ReleaseDLLStaticDeps|x86.Build.0 = ReleaseDLLStaticDeps|Win32
{3CE4A9EF-98B6-4454-B76E-3AD9C03A2114}.ReleaseDLLStaticDeps|x64.ActiveCfg = ReleaseDLLStaticDeps|x64
{3CE4A9EF-98B6-4454-B76E-3AD9C03A2114}.ReleaseDLLStaticDeps|x64.Build.0 = ReleaseDLLStaticDeps|x64
{3CE4A9EF-98B6-4454-B76E-3AD9C03A2114}.ReleaseLTO|x86.ActiveCfg = ReleaseLTO|Win32
{3CE4A9EF-98B6-4454-B76E-3AD9C03A2114}.ReleaseLTO|x86.Build.0 = ReleaseLTO|Win32
{3CE4A9EF-98B6-4454-B76E-3AD9C03A2114}.ReleaseLTO|x64.ActiveCfg = ReleaseLTO|x64
{3CE4A9EF-98B6-4454-B76E-3AD9C03A2114}.ReleaseLTO|x64.Build.0 = ReleaseLTO|x64
{6D8A6330-8EBE-49FD-9281-0A396F9F28F2}.Debug|x86.ActiveCfg = Debug|Win32
{6D8A6330-8EBE-49FD-9281-0A396F9F28F2}.Debug|x86.Build.0 = Debug|Win32
{6D8A6330-8EBE-49FD-9281-0A396F9F28F2}.Debug|x64.ActiveCfg = Debug|x64
......@@ -314,10 +254,6 @@ Global
{6D8A6330-8EBE-49FD-9281-0A396F9F28F2}.DebugDLL|x86.Build.0 = DebugDLL|Win32
{6D8A6330-8EBE-49FD-9281-0A396F9F28F2}.DebugDLL|x64.ActiveCfg = DebugDLL|x64
{6D8A6330-8EBE-49FD-9281-0A396F9F28F2}.DebugDLL|x64.Build.0 = DebugDLL|x64
{6D8A6330-8EBE-49FD-9281-0A396F9F28F2}.DebugDLLStaticDeps|x86.ActiveCfg = DebugDLLStaticDeps|Win32
{6D8A6330-8EBE-49FD-9281-0A396F9F28F2}.DebugDLLStaticDeps|x86.Build.0 = DebugDLLStaticDeps|Win32
{6D8A6330-8EBE-49FD-9281-0A396F9F28F2}.DebugDLLStaticDeps|x64.ActiveCfg = DebugDLLStaticDeps|x64
{6D8A6330-8EBE-49FD-9281-0A396F9F28F2}.DebugDLLStaticDeps|x64.Build.0 = DebugDLLStaticDeps|x64
{6D8A6330-8EBE-49FD-9281-0A396F9F28F2}.Release|x86.ActiveCfg = Release|Win32
{6D8A6330-8EBE-49FD-9281-0A396F9F28F2}.Release|x86.Build.0 = Release|Win32
{6D8A6330-8EBE-49FD-9281-0A396F9F28F2}.Release|x64.ActiveCfg = Release|x64
......@@ -330,16 +266,10 @@ Global
{6D8A6330-8EBE-49FD-9281-0A396F9F28F2}.ReleaseDLLStaticDeps|x86.Build.0 = ReleaseDLLStaticDeps|Win32
{6D8A6330-8EBE-49FD-9281-0A396F9F28F2}.ReleaseDLLStaticDeps|x64.ActiveCfg = ReleaseDLLStaticDeps|x64
{6D8A6330-8EBE-49FD-9281-0A396F9F28F2}.ReleaseDLLStaticDeps|x64.Build.0 = ReleaseDLLStaticDeps|x64
{6D8A6330-8EBE-49FD-9281-0A396F9F28F2}.ReleaseLTO|x86.ActiveCfg = ReleaseLTO|Win32
{6D8A6330-8EBE-49FD-9281-0A396F9F28F2}.ReleaseLTO|x86.Build.0 = ReleaseLTO|Win32
{6D8A6330-8EBE-49FD-9281-0A396F9F28F2}.ReleaseLTO|x64.ActiveCfg = ReleaseLTO|x64
{6D8A6330-8EBE-49FD-9281-0A396F9F28F2}.ReleaseLTO|x64.Build.0 = ReleaseLTO|x64
{4081C77E-F1F7-49FA-9BD8-A4D267C83716}.Debug|x86.ActiveCfg = Debug|Win32
{4081C77E-F1F7-49FA-9BD8-A4D267C83716}.Debug|x64.ActiveCfg = Debug|x64
{4081C77E-F1F7-49FA-9BD8-A4D267C83716}.DebugDLL|x86.ActiveCfg = DebugDLL|Win32
{4081C77E-F1F7-49FA-9BD8-A4D267C83716}.DebugDLL|x64.ActiveCfg = DebugDLL|x64
{4081C77E-F1F7-49FA-9BD8-A4D267C83716}.DebugDLLStaticDeps|x86.ActiveCfg = DebugDLL|Win32
{4081C77E-F1F7-49FA-9BD8-A4D267C83716}.DebugDLLStaticDeps|x64.ActiveCfg = DebugDLL|x64
{4081C77E-F1F7-49FA-9BD8-A4D267C83716}.Release|x86.ActiveCfg = Release|Win32
{4081C77E-F1F7-49FA-9BD8-A4D267C83716}.Release|x86.Build.0 = Release|Win32
{4081C77E-F1F7-49FA-9BD8-A4D267C83716}.Release|x64.ActiveCfg = Release|x64
......@@ -348,14 +278,10 @@ Global
{4081C77E-F1F7-49FA-9BD8-A4D267C83716}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64
{4081C77E-F1F7-49FA-9BD8-A4D267C83716}.ReleaseDLLStaticDeps|x86.ActiveCfg = ReleaseDLL|Win32
{4081C77E-F1F7-49FA-9BD8-A4D267C83716}.ReleaseDLLStaticDeps|x64.ActiveCfg = ReleaseDLL|x64
{4081C77E-F1F7-49FA-9BD8-A4D267C83716}.ReleaseLTO|x86.ActiveCfg = Release|Win32
{4081C77E-F1F7-49FA-9BD8-A4D267C83716}.ReleaseLTO|x64.ActiveCfg = Release|x64
{E2A6865D-BD68-45B4-8130-EFD620F2C7EB}.Debug|x86.ActiveCfg = Debug|Win32
{E2A6865D-BD68-45B4-8130-EFD620F2C7EB}.Debug|x64.ActiveCfg = Debug|x64
{E2A6865D-BD68-45B4-8130-EFD620F2C7EB}.DebugDLL|x86.ActiveCfg = DebugDLL|Win32
{E2A6865D-BD68-45B4-8130-EFD620F2C7EB}.DebugDLL|x64.ActiveCfg = DebugDLL|x64
{E2A6865D-BD68-45B4-8130-EFD620F2C7EB}.DebugDLLStaticDeps|x86.ActiveCfg = DebugDLL|Win32
{E2A6865D-BD68-45B4-8130-EFD620F2C7EB}.DebugDLLStaticDeps|x64.ActiveCfg = DebugDLL|x64
{E2A6865D-BD68-45B4-8130-EFD620F2C7EB}.Release|x86.ActiveCfg = Release|Win32
{E2A6865D-BD68-45B4-8130-EFD620F2C7EB}.Release|x86.Build.0 = Release|Win32
{E2A6865D-BD68-45B4-8130-EFD620F2C7EB}.Release|x64.ActiveCfg = Release|x64
......@@ -364,14 +290,10 @@ Global
{E2A6865D-BD68-45B4-8130-EFD620F2C7EB}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64
{E2A6865D-BD68-45B4-8130-EFD620F2C7EB}.ReleaseDLLStaticDeps|x86.ActiveCfg = ReleaseDLL|Win32
{E2A6865D-BD68-45B4-8130-EFD620F2C7EB}.ReleaseDLLStaticDeps|x64.ActiveCfg = ReleaseDLL|x64
{E2A6865D-BD68-45B4-8130-EFD620F2C7EB}.ReleaseLTO|x86.ActiveCfg = Release|Win32
{E2A6865D-BD68-45B4-8130-EFD620F2C7EB}.ReleaseLTO|x64.ActiveCfg = Release|x64
{147A422A-FA63-4724-A5D9-08B1CAFDAB59}.Debug|x86.ActiveCfg = Debug|Win32
{147A422A-FA63-4724-A5D9-08B1CAFDAB59}.Debug|x64.ActiveCfg = Debug|x64
{147A422A-FA63-4724-A5D9-08B1CAFDAB59}.DebugDLL|x86.ActiveCfg = DebugDLL|Win32
{147A422A-FA63-4724-A5D9-08B1CAFDAB59}.DebugDLL|x64.ActiveCfg = DebugDLL|x64
{147A422A-FA63-4724-A5D9-08B1CAFDAB59}.DebugDLLStaticDeps|x86.ActiveCfg = DebugDLL|Win32
{147A422A-FA63-4724-A5D9-08B1CAFDAB59}.DebugDLLStaticDeps|x64.ActiveCfg = DebugDLL|x64
{147A422A-FA63-4724-A5D9-08B1CAFDAB59}.Release|x86.ActiveCfg = Release|Win32
{147A422A-FA63-4724-A5D9-08B1CAFDAB59}.Release|x86.Build.0 = Release|Win32
{147A422A-FA63-4724-A5D9-08B1CAFDAB59}.Release|x64.ActiveCfg = Release|x64
......@@ -380,8 +302,6 @@ Global
{147A422A-FA63-4724-A5D9-08B1CAFDAB59}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64
{147A422A-FA63-4724-A5D9-08B1CAFDAB59}.ReleaseDLLStaticDeps|x86.ActiveCfg = ReleaseDLL|Win32
{147A422A-FA63-4724-A5D9-08B1CAFDAB59}.ReleaseDLLStaticDeps|x64.ActiveCfg = ReleaseDLL|x64
{147A422A-FA63-4724-A5D9-08B1CAFDAB59}.ReleaseLTO|x86.ActiveCfg = Release|Win32
{147A422A-FA63-4724-A5D9-08B1CAFDAB59}.ReleaseLTO|x64.ActiveCfg = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
SMP/ffmpeg.vcxproj
浏览文件 @ fe4085f0
......@@ -55,6 +55,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
......@@ -63,6 +64,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="Configuration">
......@@ -71,6 +73,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="Configuration">
......@@ -79,6 +82,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
......@@ -87,6 +91,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
......@@ -95,6 +100,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="Configuration">
......@@ -103,6 +109,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="Configuration">
......@@ -111,6 +118,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
......@@ -142,48 +150,56 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetName>ffmpegd</TargetName>
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetName>ffmpegd</TargetName>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
<TargetName>ffmpegd</TargetName>
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
<TargetName>ffmpegd</TargetName>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<TargetName>ffmpeg</TargetName>
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<TargetName>ffmpeg</TargetName>
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
<TargetName>ffmpeg</TargetName>
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
<TargetName>ffmpeg</TargetName>
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
......
SMP/ffmpeg_with_latest_sdk.bat 0 → 100644
浏览文件 @ fe4085f0
@ECHO OFF
SET PROJECT=ffmpeg
@REM Detect the newest available Windows SDK
CALL :GetWindowsSdkVer
@REM Open the project
%PROJECT%.sln
EXIT /B 0
:GetWindowsSdkVer
SET WindowsTargetPlatformVersion=
IF "%WindowsTargetPlatformVersion%"=="" CALL :GetWin10SdkVer
IF "%WindowsTargetPlatformVersion%"=="" CALL :GetWin81SdkVer
EXIT /B 0
:GetWin10SdkVer
CALL :GetWin10SdkVerHelper HKLM\SOFTWARE\Wow6432Node > nul 2>&1
IF errorlevel 1 CALL :GetWin10SdkVerHelper HKCU\SOFTWARE\Wow6432Node > nul 2>&1
IF errorlevel 1 CALL :GetWin10SdkVerHelper HKLM\SOFTWARE > nul 2>&1
IF errorlevel 1 CALL :GetWin10SdkVerHelper HKCU\SOFTWARE > nul 2>&1
IF errorlevel 1 EXIT /B 1
EXIT /B 0
:GetWin10SdkVerHelper
@REM Get Windows 10 SDK installed folder
FOR /F "tokens=1,2*" %%i IN ('reg query "%1\Microsoft\Microsoft SDKs\Windows\v10.0" /v "InstallationFolder"') DO (
IF "%%i"=="InstallationFolder" (
SET WindowsSdkDir=%%~k
)
)
@REM get windows 10 sdk version number
SETLOCAL enableDelayedExpansion
IF NOT "%WindowsSdkDir%"=="" FOR /f %%i IN ('dir "%WindowsSdkDir%include\" /b /ad-h /on') DO (
@REM Skip if Windows.h is not found in %%i\um. This would indicate that only the UCRT MSIs were
@REM installed for this Windows SDK version.
IF EXIST "%WindowsSdkDir%include\%%i\um\Windows.h" (
SET result=%%i
IF "!result:~0,3!"=="10." (
SET SDK=!result!
IF "!result!"=="%VSCMD_ARG_WINSDK%" SET findSDK=1
)
)
)
IF "%findSDK%"=="1" SET SDK=%VSCMD_ARG_WINSDK%
ENDLOCAL & SET WindowsTargetPlatformVersion=%SDK%
IF "%WindowsTargetPlatformVersion%"=="" (
EXIT /B 1
)
EXIT /B 0
:GetWin81SdkVer
SET WindowsTargetPlatformVersion=8.1
EXIT /B 0
SMP/ffplay.vcxproj
浏览文件 @ fe4085f0
......@@ -50,6 +50,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
......@@ -58,6 +59,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="Configuration">
......@@ -66,6 +68,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="Configuration">
......@@ -74,6 +77,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
......@@ -82,6 +86,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
......@@ -90,6 +95,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="Configuration">
......@@ -98,6 +104,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="Configuration">
......@@ -106,6 +113,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
......@@ -137,48 +145,56 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetName>ffplayd</TargetName>
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetName>ffplayd</TargetName>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
<TargetName>ffplayd</TargetName>
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
<TargetName>ffplayd</TargetName>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<TargetName>ffplay</TargetName>
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<TargetName>ffplay</TargetName>
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
<TargetName>ffplay</TargetName>
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
<TargetName>ffplay</TargetName>
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
......
SMP/ffprobe.vcxproj
浏览文件 @ fe4085f0
......@@ -50,6 +50,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
......@@ -58,6 +59,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="Configuration">
......@@ -66,6 +68,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="Configuration">
......@@ -74,6 +77,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
......@@ -82,6 +86,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
......@@ -90,6 +95,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="Configuration">
......@@ -98,6 +104,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="Configuration">
......@@ -106,6 +113,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
......@@ -137,48 +145,56 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetName>ffprobed</TargetName>
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetName>ffprobed</TargetName>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
<TargetName>ffprobed</TargetName>
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
<TargetName>ffprobed</TargetName>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<TargetName>ffprobe</TargetName>
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<TargetName>ffprobe</TargetName>
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
<TargetName>ffprobe</TargetName>
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
<TargetName>ffprobe</TargetName>
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
......
SMP/libavcodec.vcxproj
浏览文件 @ fe4085f0
此差异已折叠。
SMP/libavcodec.vcxproj.filters
浏览文件 @ fe4085f0
......@@ -136,7 +136,10 @@
<NASM Include="..\libavcodec\x86\mpegvideoencdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</NASM>
<NASM Include="..\libavcodec\x86\opus_pvq_search.asm">
<NASM Include="..\libavcodec\x86\opusdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</NASM>
<NASM Include="..\libavcodec\x86\celt_pvq_search.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</NASM>
<NASM Include="..\libavcodec\x86\pixblockdsp.asm">
......@@ -786,6 +789,9 @@
<ClCompile Include="..\libavcodec\ac3enc_fixed.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\agm.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\aic.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -2643,6 +2649,9 @@
<ClCompile Include="..\libavcodec\av1_metadata_bsf.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\av1_frame_split_bsf.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\chomp_bsf.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -2883,7 +2892,10 @@
<ClCompile Include="..\libavcodec\x86\exrdsp_init.c">
<Filter>Source Files\libavcodec\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\x86\opus_dsp_init.c">
<ClCompile Include="..\libavcodec\x86\opusdsp_init.c">
<Filter>Source Files\libavcodec\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\x86\celt_pvq_init.c">
<Filter>Source Files\libavcodec\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\x86\hevcdsp_init.c">
......@@ -3075,6 +3087,9 @@
<ClCompile Include="..\libavcodec\xvididct.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\opusdsp.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\proresdsp.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......
SMP/libavcodec/bsf_list.c
浏览文件 @ fe4085f0
......@@ -20,6 +20,7 @@
*/
static const AVBitStreamFilter *bitstream_filters[] = {
&ff_aac_adtstoasc_bsf,
&ff_av1_frame_split_bsf,
&ff_av1_metadata_bsf,
&ff_chomp_bsf,
&ff_dump_extradata_bsf,
......
SMP/libavcodec/codec_list.c
浏览文件 @ fe4085f0
......@@ -199,6 +199,7 @@ static const AVCodec *codec_list[] = {
&ff_aasc_decoder,
&ff_aic_decoder,
&ff_alias_pix_decoder,
&ff_agm_decoder,
&ff_amv_decoder,
&ff_anm_decoder,
&ff_ansi_decoder,
......@@ -299,6 +300,7 @@ static const AVCodec *codec_list[] = {
&ff_kmvc_decoder,
&ff_lagarith_decoder,
&ff_loco_decoder,
&ff_lscr_decoder,
&ff_m101_decoder,
&ff_magicyuv_decoder,
&ff_mdec_decoder,
......@@ -570,6 +572,7 @@ static const AVCodec *codec_list[] = {
&ff_adpcm_4xm_decoder,
&ff_adpcm_adx_decoder,
&ff_adpcm_afc_decoder,
&ff_adpcm_agm_decoder,
&ff_adpcm_aica_decoder,
&ff_adpcm_ct_decoder,
&ff_adpcm_dtk_decoder,
......
SMP/libavcodec/dce_defs.c
浏览文件 @ fe4085f0
......@@ -47,6 +47,7 @@
#include "libavcodec/qpeldsp.h"
#include "libavcodec/aacpsdsp.h"
#include "libavcodec/pixblockdsp.h"
#include "libavcodec/opusdsp.h"
#include "libavcodec/mpegvideo.h"
#include "libavcodec/mpegvideoencdsp.h"
#include "libavcodec/mpegvideodsp.h"
......@@ -3489,6 +3490,7 @@ void ff_mpv_common_init_axp(MpegEncContext *s) {return;}
void ff_mpv_common_init_mips(MpegEncContext *s) {return;}
void ff_mpv_common_init_neon(MpegEncContext *s) {return;}
void ff_mpv_common_init_ppc(MpegEncContext *s) {return;}
void ff_opus_dsp_init_aarch64(OpusDSP *ctx) {return;}
void ff_pixblockdsp_init_alpha(PixblockDSPContext *c, AVCodecContext *avctx,
unsigned high_bit_depth) {return;}
void ff_pixblockdsp_init_arm(PixblockDSPContext *c, AVCodecContext *avctx,
......
SMP/libavdevice.vcxproj
浏览文件 @ fe4085f0
此差异已折叠。
SMP/libavfilter.vcxproj
浏览文件 @ fe4085f0
此差异已折叠。
SMP/libavformat.vcxproj
浏览文件 @ fe4085f0
此差异已折叠。
SMP/libavformat/demuxer_list.c
浏览文件 @ fe4085f0
......@@ -136,6 +136,7 @@ static const AVInputFormat *demuxer_list[] = {
&ff_ivr_demuxer,
&ff_jacosub_demuxer,
&ff_jv_demuxer,
&ff_kux_demuxer,
&ff_lmlm4_demuxer,
&ff_loas_demuxer,
&ff_lrc_demuxer,
......
SMP/libavutil.vcxproj
浏览文件 @ fe4085f0
此差异已折叠。
SMP/libpostproc.vcxproj
浏览文件 @ fe4085f0
此差异已折叠。
SMP/libswresample.vcxproj
浏览文件 @ fe4085f0
此差异已折叠。
SMP/libswscale.vcxproj
浏览文件 @ fe4085f0
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或