diff --git a/SMP/SMP.patch b/SMP/SMP.patch index 661cd15b22b6b..e72cee881e91b 100644 --- a/SMP/SMP.patch +++ b/SMP/SMP.patch @@ -1,22 +1,83 @@ -diff --git a/fftools/opt_common.c b/fftools/opt_common.c -index 9d2d5184a0..4f0a8d59ce 100644 ---- a/fftools/opt_common.c -+++ b/fftools/opt_common.c -@@ -48,6 +48,9 @@ - #include "libavformat/avformat.h" - #include "libavformat/version.h" +diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h +index 733d551fa4..24800ab676 100644 +--- a/fftools/ffmpeg.h ++++ b/fftools/ffmpeg.h +@@ -831,7 +831,7 @@ int dec_create(const OptionsContext *o, const char *arg, Scheduler *sch); + * @retval ">=0" non-negative scheduler index on success + * @retval "<0" an error code on failure + */ +-int dec_init(Decoder **pdec, Scheduler *sch, ++int dec_open(Decoder **pdec, Scheduler *sch, + AVDictionary **dec_opts, const DecoderOpts *o, + AVFrame *param_out); + void dec_free(Decoder **pdec); +diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c +index 2723a0312e..bd8c5c2ee4 100644 +--- a/fftools/ffmpeg_dec.c ++++ b/fftools/ffmpeg_dec.c +@@ -829,7 +829,7 @@ static int packet_decode(DecoderPriv *dp, AVPacket *pkt, AVFrame *frame) + } + } -+#include "libavfilter/avfilter.h" -+#include "libavfilter/version.h" -+ - #include "libavdevice/avdevice.h" - #include "libavdevice/version.h" +-static int dec_open(DecoderPriv *dp, AVDictionary **dec_opts, ++static int dec_open2(DecoderPriv *dp, AVDictionary **dec_opts, + const DecoderOpts *o, AVFrame *param_out); + + static int dec_standalone_open(DecoderPriv *dp, const AVPacket *pkt) +@@ -864,7 +864,7 @@ static int dec_standalone_open(DecoderPriv *dp, const AVPacket *pkt) + snprintf(name, sizeof(name), "dec%d", dp->index); + o.name = name; + +- return dec_open(dp, &dp->standalone_init.opts, &o, NULL); ++ return dec_open2(dp, &dp->standalone_init.opts, &o, NULL); + } + + static void dec_thread_set_name(const DecoderPriv *dp) +@@ -1519,7 +1519,7 @@ static int hw_device_setup_for_decode(DecoderPriv *dp, + return 0; + } + +-static int dec_open(DecoderPriv *dp, AVDictionary **dec_opts, ++static int dec_open2(DecoderPriv *dp, AVDictionary **dec_opts, + const DecoderOpts *o, AVFrame *param_out) + { + const AVCodec *codec = o->codec; +@@ -1644,7 +1644,7 @@ static int dec_open(DecoderPriv *dp, AVDictionary **dec_opts, + return 0; + } + +-int dec_init(Decoder **pdec, Scheduler *sch, ++int dec_open(Decoder **pdec, Scheduler *sch, + AVDictionary **dec_opts, const DecoderOpts *o, + AVFrame *param_out) + { +@@ -1659,7 +1659,7 @@ int dec_init(Decoder **pdec, Scheduler *sch, + + multiview_check_manual(dp, *dec_opts); + +- ret = dec_open(dp, dec_opts, o, param_out); ++ ret = dec_open2(dp, dec_opts, o, param_out); + if (ret < 0) + goto fail; + +diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c +index 13aef15eab..5b3c3b588a 100644 +--- a/fftools/ffmpeg_demux.c ++++ b/fftools/ffmpeg_demux.c +@@ -948,7 +948,7 @@ static int ist_use(InputStream *ist, int decoding_needed, + if (!ds->decoded_params) + return AVERROR(ENOMEM); +- ret = dec_init(&ist->decoder, d->sch, ++ ret = dec_open(&ist->decoder, d->sch, + &ds->decoder_opts, &ds->dec_opts, ds->decoded_params); + if (ret < 0) + return ret; diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c -index a674a35aa4..d7a52378b5 100644 +index b8f8a25f43..323b39267d 100644 --- a/libavcodec/mfenc.c +++ b/libavcodec/mfenc.c -@@ -59,6 +59,10 @@ typedef struct MFContext { +@@ -60,6 +60,10 @@ typedef struct MFContext { static int mf_choose_output_type(AVCodecContext *avctx); static int mf_setup_context(AVCodecContext *avctx); @@ -28,18 +89,18 @@ index a674a35aa4..d7a52378b5 100644 // Sentinel value only used by us. #define MF_INVALID_TIME AV_NOPTS_VALUE diff --git a/libavfilter/textutils.c b/libavfilter/textutils.c -index ef658d04a2..3ecce972f2 100644 +index e6b5239b20..1693b04678 100644 --- a/libavfilter/textutils.c +++ b/libavfilter/textutils.c -@@ -30,6 +30,7 @@ - #include "libavutil/error.h" +@@ -31,6 +31,7 @@ #include "libavutil/file.h" + #include "libavutil/mem.h" #include "libavutil/time.h" +#include "libavutil/time_internal.h" static int ff_expand_text_function_internal(FFExpandTextContext *expand_text, AVBPrint *bp, char *name, unsigned argc, char **argv) -@@ -189,7 +190,7 @@ int ff_print_pts(void *log_ctx, AVBPrint *bp, double pts, const char *delta, +@@ -190,7 +191,7 @@ int ff_print_pts(void *log_ctx, AVBPrint *bp, double pts, const char *delta, if (!strcmp(fmt, "localtime")) localtime_r(&ms, &tm); else @@ -48,7 +109,7 @@ index ef658d04a2..3ecce972f2 100644 av_bprint_strftime(bp, av_x_if_null(strftime_fmt, "%Y-%m-%d %H:%M:%S"), &tm); } else { av_log(log_ctx, AV_LOG_ERROR, "Invalid format '%s'\n", fmt); -@@ -219,7 +220,7 @@ int ff_print_time(void *log_ctx, AVBPrint *bp, +@@ -220,7 +221,7 @@ int ff_print_time(void *log_ctx, AVBPrint *bp, if (localtime) localtime_r(&now, &tm); else diff --git a/SMP/appveyor.yml b/SMP/appveyor.yml index 9c7bae273afb1..2bde12dbcb5e0 100644 --- a/SMP/appveyor.yml +++ b/SMP/appveyor.yml @@ -16,8 +16,6 @@ environment: GITHUBTOKEN: secure: c9Sads7Y16h7FP+LrR3IjVygYAgh8GByE8TtazxDg7jpPVxc+XDV81z7MoUc2Ada matrix: - - MSVC_VER: 15 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - MSVC_VER: 16 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - MSVC_VER: 17 diff --git a/SMP/config.asm b/SMP/config.asm index e2f34a0cfa537..a3560d7c68d16 100644 --- a/SMP/config.asm +++ b/SMP/config.asm @@ -20,12 +20,7 @@ ;****** %define ARCH_AARCH64 0 -%define ARCH_ALPHA 0 %define ARCH_ARM 0 -%define ARCH_AVR32 0 -%define ARCH_AVR32_AP 0 -%define ARCH_AVR32_UC 0 -%define ARCH_BFIN 0 %define ARCH_IA64 0 %define ARCH_LOONGARCH 0 %define ARCH_LOONGARCH32 0 @@ -38,7 +33,6 @@ %define ARCH_PPC64 0 %define ARCH_RISCV 0 %define ARCH_S390 0 -%define ARCH_SH4 0 %define ARCH_SPARC 0 %define ARCH_SPARC64 0 %define ARCH_TILEGX 0 @@ -73,6 +67,8 @@ %define HAVE_VSX 0 %define HAVE_RV 0 %define HAVE_RVV 0 +%define HAVE_RV_ZICBOP 0 +%define HAVE_RV_ZVBB 0 %define HAVE_AESNI 1 %define HAVE_AMD3DNOW 1 %define HAVE_AMD3DNOWEXT 1 @@ -124,6 +120,8 @@ %define HAVE_VSX_EXTERNAL 0 %define HAVE_RV_EXTERNAL 0 %define HAVE_RVV_EXTERNAL 0 +%define HAVE_RV_ZICBOP_EXTERNAL 0 +%define HAVE_RV_ZVBB_EXTERNAL 0 %define HAVE_AESNI_EXTERNAL 1 %define HAVE_AMD3DNOW_EXTERNAL 1 %define HAVE_AMD3DNOWEXT_EXTERNAL 1 @@ -175,6 +173,8 @@ %define HAVE_VSX_INLINE 0 %define HAVE_RV_INLINE 0 %define HAVE_RVV_INLINE 0 +%define HAVE_RV_ZICBOP_INLINE 0 +%define HAVE_RV_ZVBB_INLINE 0 %define HAVE_AESNI_INLINE 1 %define HAVE_AMD3DNOW_INLINE 1 %define HAVE_AMD3DNOWEXT_INLINE 1 @@ -225,19 +225,17 @@ %define HAVE_SIMD_ALIGN_16 1 %define HAVE_SIMD_ALIGN_32 1 %define HAVE_SIMD_ALIGN_64 1 -%define HAVE_ATOMIC_CAS_PTR 0 -%define HAVE_MACHINE_RW_BARRIER 0 %define HAVE_MEMORYBARRIER 1 %define HAVE_MM_EMPTY 1 %define HAVE_RDTSC 1 %define HAVE_SEM_TIMEDWAIT 0 -%define HAVE_SYNC_VAL_COMPARE_AND_SWAP 0 %define HAVE_INLINE_ASM 1 %define HAVE_SYMVER 0 %define HAVE_X86ASM 1 %define HAVE_BIGENDIAN 0 %define HAVE_FAST_UNALIGNED 1 %define HAVE_ARPA_INET_H 0 +%define HAVE_ASM_HWPROBE_H 0 %define HAVE_ASM_TYPES_H 0 %define HAVE_CDIO_PARANOIA_H 0 %define HAVE_CDIO_PARANOIA_PARANOIA_H 1 @@ -264,6 +262,7 @@ %define HAVE_OPENGL_GL3_H 0 %define HAVE_POLL_H 0 %define HAVE_PTHREAD_NP_H 0 +%define HAVE_SYS_HWPROBE_H 0 %define HAVE_SYS_PARAM_H 0 %define HAVE_SYS_RESOURCE_H 0 %define HAVE_SYS_SELECT_H 0 @@ -278,6 +277,7 @@ %define HAVE_WINDOWS_H 1 %define HAVE_WINSOCK2_H 1 %define HAVE_INTRINSICS_NEON 0 +%define HAVE_INTRINSICS_SSE2 0 %define HAVE_ATANF 1 %define HAVE_ATAN2F 1 %define HAVE_CBRT 1 @@ -320,6 +320,7 @@ %define HAVE_CLOCK_GETTIME 0 %define HAVE_CLOSESOCKET 1 %define HAVE_COMMANDLINETOARGVW 1 +%define HAVE_ELF_AUX_INFO 0 %define HAVE_FCNTL 0 %define HAVE_GETADDRINFO 1 %define HAVE_GETAUXVAL 0 @@ -368,6 +369,7 @@ %define HAVE_SYSCONF 0 %define HAVE_SYSCTL 0 %define HAVE_SYSCTLBYNAME 0 +%define HAVE_TEMPNAM 0 %define HAVE_USLEEP 0 %define HAVE_UTGETOSTYPEFROMSTRING 0 %define HAVE_VIRTUALALLOC 1 @@ -437,6 +439,7 @@ %define HAVE_STRUCT_SOCKADDR_STORAGE 1 %define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 0 %define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0 +%define HAVE_STRUCT_MFXCONFIGINTERFACE 0 %define HAVE_GZIP 0 %define HAVE_LIBDRM_GETFB2 0 %define HAVE_MAKEINFO 0 @@ -450,6 +453,7 @@ %define HAVE_OPENCL_VIDEOTOOLBOX 0 %define HAVE_PERL 0 %define HAVE_POD2MAN 0 +%define HAVE_POSIX_IOCTL 0 %define HAVE_TEXI2HTML 0 %define HAVE_XMLLINT 0 %define HAVE_ZLIB_GZIP 0 @@ -538,6 +542,8 @@ %define CONFIG_LIBJXL 0 %define CONFIG_LIBKLVANC 0 %define CONFIG_LIBKVAZAAR 0 +%define CONFIG_LIBLC3 0 +%define CONFIG_LIBLCEVC_DEC 0 %define CONFIG_LIBMODPLUG 1 %define CONFIG_LIBMP3LAME 1 %define CONFIG_LIBMYSOFA 0 @@ -575,6 +581,7 @@ %define CONFIG_LIBVMAF 0 %define CONFIG_LIBVORBIS 1 %define CONFIG_LIBVPX 1 +%define CONFIG_LIBVVENC 0 %define CONFIG_LIBWEBP 0 %define CONFIG_LIBXEVD 0 %define CONFIG_LIBXEVE 0 @@ -661,6 +668,7 @@ %define CONFIG_ERROR_RESILIENCE 1 %define CONFIG_FAAN 1 %define CONFIG_FAST_UNALIGNED 1 +%define CONFIG_IAMF 0 %define CONFIG_LSP 1 %define CONFIG_PIXELUTILS 1 %define CONFIG_NETWORK 1 @@ -706,10 +714,12 @@ %define CONFIG_CBS_MPEG2 1 %define CONFIG_CBS_VP8 1 %define CONFIG_CBS_VP9 1 +%define CONFIG_D3D12VA_ENCODE 1 %define CONFIG_DEFLATE_WRAPPER 1 %define CONFIG_DIRAC_PARSE 1 -%define CONFIG_DNN 1 -%define CONFIG_DOVI_RPU 1 +%define CONFIG_DNN 0 +%define CONFIG_DOVI_RPUDEC 1 +%define CONFIG_DOVI_RPUENC 1 %define CONFIG_DVPROFILE 1 %define CONFIG_EVCPARSE 1 %define CONFIG_EXIF 1 @@ -734,13 +744,14 @@ %define CONFIG_HUFFMAN 1 %define CONFIG_HUFFYUVDSP 1 %define CONFIG_HUFFYUVENCDSP 1 -%define CONFIG_IAMFDEC 1 -%define CONFIG_IAMFENC 1 +%define CONFIG_IAMFDEC 0 +%define CONFIG_IAMFENC 0 %define CONFIG_IDCTDSP 1 %define CONFIG_IIRFILTER 1 %define CONFIG_INFLATE_WRAPPER 1 %define CONFIG_INTRAX8 1 %define CONFIG_ISO_MEDIA 1 +%define CONFIG_ISO_WRITER 1 %define CONFIG_IVIDSP 1 %define CONFIG_JPEGTABLES 1 %define CONFIG_LGPLV3 0 @@ -790,5 +801,6 @@ %define CONFIG_VP3DSP 1 %define CONFIG_VP56DSP 1 %define CONFIG_VP8DSP 1 +%define CONFIG_VULKAN_ENCODE 0 %define CONFIG_WMA_FREQS 1 %define CONFIG_WMV2DSP 1 diff --git a/SMP/config.h b/SMP/config.h index aa6bac24a73a6..4c17200d2af15 100644 --- a/SMP/config.h +++ b/SMP/config.h @@ -33,6 +33,8 @@ #define AVCONV_DATADIR "." #if defined(__INTEL_COMPILER) # define CC_IDENT "icl" +#elif defined(__clang__) +# define CC_IDENT "clang-cl" #else # define CC_IDENT "msvc" #endif @@ -55,12 +57,7 @@ #endif #define SWS_MAX_FILTER_SIZE 256 #define ARCH_AARCH64 0 -#define ARCH_ALPHA 0 #define ARCH_ARM 0 -#define ARCH_AVR32 0 -#define ARCH_AVR32_AP 0 -#define ARCH_AVR32_UC 0 -#define ARCH_BFIN 0 #define ARCH_IA64 0 #define ARCH_LOONGARCH 0 #define ARCH_LOONGARCH32 0 @@ -73,7 +70,6 @@ #define ARCH_PPC64 0 #define ARCH_RISCV 0 #define ARCH_S390 0 -#define ARCH_SH4 0 #define ARCH_SPARC 0 #define ARCH_SPARC64 0 #define ARCH_TILEGX 0 @@ -107,6 +103,8 @@ #define HAVE_VSX 0 #define HAVE_RV 0 #define HAVE_RVV 0 +#define HAVE_RV_ZICBOP 0 +#define HAVE_RV_ZVBB 0 #define HAVE_AESNI 1 #define HAVE_AMD3DNOW 1 #define HAVE_AMD3DNOWEXT 1 @@ -158,6 +156,8 @@ #define HAVE_VSX_EXTERNAL 0 #define HAVE_RV_EXTERNAL 0 #define HAVE_RVV_EXTERNAL 0 +#define HAVE_RV_ZICBOP_EXTERNAL 0 +#define HAVE_RV_ZVBB_EXTERNAL 0 #define HAVE_AESNI_EXTERNAL 1 #define HAVE_AMD3DNOW_EXTERNAL 1 #define HAVE_AMD3DNOWEXT_EXTERNAL 1 @@ -209,6 +209,8 @@ #define HAVE_VSX_INLINE 0 #define HAVE_RV_INLINE 0 #define HAVE_RVV_INLINE 0 +#define HAVE_RV_ZICBOP_INLINE 0 +#define HAVE_RV_ZVBB_INLINE 0 #define HAVE_AESNI_INLINE ARCH_X86 && HAVE_INLINE_ASM #define HAVE_AMD3DNOW_INLINE ARCH_X86 && HAVE_INLINE_ASM #define HAVE_AMD3DNOWEXT_INLINE ARCH_X86 && HAVE_INLINE_ASM @@ -259,8 +261,6 @@ #define HAVE_SIMD_ALIGN_16 1 #define HAVE_SIMD_ALIGN_32 1 #define HAVE_SIMD_ALIGN_64 1 -#define HAVE_ATOMIC_CAS_PTR 0 -#define HAVE_MACHINE_RW_BARRIER 0 #define HAVE_MEMORYBARRIER 1 #if defined(__INTEL_COMPILER) || ARCH_X86_32 # define HAVE_MM_EMPTY 1 @@ -269,8 +269,7 @@ #endif #define HAVE_RDTSC 1 #define HAVE_SEM_TIMEDWAIT 0 -#define HAVE_SYNC_VAL_COMPARE_AND_SWAP 0 -#if defined(__INTEL_COMPILER) +#if defined(__INTEL_COMPILER) || defined(__clang__) # define HAVE_INLINE_ASM 1 #else # define HAVE_INLINE_ASM 0 @@ -280,6 +279,7 @@ #define HAVE_BIGENDIAN 0 #define HAVE_FAST_UNALIGNED 1 #define HAVE_ARPA_INET_H 0 +#define HAVE_ASM_HWPROBE_H 0 #define HAVE_ASM_TYPES_H 0 #define HAVE_CDIO_PARANOIA_H 0 #define HAVE_CDIO_PARANOIA_PARANOIA_H 1 @@ -306,6 +306,7 @@ #define HAVE_OPENGL_GL3_H 0 #define HAVE_POLL_H 0 #define HAVE_PTHREAD_NP_H 0 +#define HAVE_SYS_HWPROBE_H 0 #define HAVE_SYS_PARAM_H 0 #define HAVE_SYS_RESOURCE_H 0 #define HAVE_SYS_SELECT_H 0 @@ -320,6 +321,7 @@ #define HAVE_WINDOWS_H 1 #define HAVE_WINSOCK2_H 1 #define HAVE_INTRINSICS_NEON 0 +#define HAVE_INTRINSICS_SSE2 0 #define HAVE_ATANF 1 #define HAVE_ATAN2F 1 #define HAVE_CBRT 1 @@ -370,6 +372,7 @@ #define HAVE_CLOCK_GETTIME 0 #define HAVE_CLOSESOCKET 1 #define HAVE_COMMANDLINETOARGVW 1 +#define HAVE_ELF_AUX_INFO 0 #define HAVE_FCNTL 0 #define HAVE_GETADDRINFO 1 #define HAVE_GETAUXVAL 0 @@ -442,6 +445,7 @@ #define HAVE_SYSCONF 0 #define HAVE_SYSCTL 0 #define HAVE_SYSCTLBYNAME 0 +#define HAVE_TEMPNAM 0 #define HAVE_USLEEP 0 #define HAVE_UTGETOSTYPEFROMSTRING 0 #if !HAVE_WINRT && !HAVE_UWP @@ -535,6 +539,7 @@ #define HAVE_STRUCT_SOCKADDR_STORAGE 1 #define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 0 #define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0 +#define HAVE_STRUCT_MFXCONFIGINTERFACE 0 #define HAVE_GZIP 0 #define HAVE_LIBDRM_GETFB2 0 #define HAVE_MAKEINFO 0 @@ -548,6 +553,7 @@ #define HAVE_OPENCL_VIDEOTOOLBOX 0 #define HAVE_PERL 0 #define HAVE_POD2MAN 0 +#define HAVE_POSIX_IOCTL 0 #define HAVE_TEXI2HTML 0 #define HAVE_XMLLINT 0 #define HAVE_ZLIB_GZIP 0 @@ -636,6 +642,8 @@ #define CONFIG_LIBJXL 0 #define CONFIG_LIBKLVANC 0 #define CONFIG_LIBKVAZAAR 0 +#define CONFIG_LIBLC3 0 +#define CONFIG_LIBLCEVC_DEC 0 #define CONFIG_LIBMODPLUG 1 #define CONFIG_LIBMP3LAME 1 #define CONFIG_LIBMYSOFA 0 @@ -673,6 +681,7 @@ #define CONFIG_LIBVMAF 0 #define CONFIG_LIBVORBIS 1 #define CONFIG_LIBVPX 1 +#define CONFIG_LIBVVENC 0 #define CONFIG_LIBWEBP 0 #define CONFIG_LIBXEVD 0 #define CONFIG_LIBXEVE 0 @@ -811,6 +820,7 @@ #define CONFIG_ERROR_RESILIENCE 1 #define CONFIG_FAAN 1 #define CONFIG_FAST_UNALIGNED 1 +#define CONFIG_IAMF 0 #define CONFIG_LSP 1 #define CONFIG_PIXELUTILS 1 #define CONFIG_NETWORK 1 @@ -856,10 +866,16 @@ #define CONFIG_CBS_MPEG2 1 #define CONFIG_CBS_VP8 1 #define CONFIG_CBS_VP9 1 +#if CONFIG_D3D12VA && defined(NTDDI_WIN10_NI) +# define CONFIG_D3D12VA_ENCODE 1 +#else +# define CONFIG_D3D12VA_ENCODE 0 +#endif #define CONFIG_DEFLATE_WRAPPER 1 #define CONFIG_DIRAC_PARSE 1 -#define CONFIG_DNN 1 -#define CONFIG_DOVI_RPU 1 +#define CONFIG_DNN 0 +#define CONFIG_DOVI_RPUDEC 1 +#define CONFIG_DOVI_RPUENC 1 #define CONFIG_DVPROFILE 1 #define CONFIG_EVCPARSE 1 #define CONFIG_EXIF 1 @@ -884,13 +900,14 @@ #define CONFIG_HUFFMAN 1 #define CONFIG_HUFFYUVDSP 1 #define CONFIG_HUFFYUVENCDSP 1 -#define CONFIG_IAMFDEC 1 -#define CONFIG_IAMFENC 1 +#define CONFIG_IAMFDEC 0 +#define CONFIG_IAMFENC 0 #define CONFIG_IDCTDSP 1 #define CONFIG_IIRFILTER 1 #define CONFIG_INFLATE_WRAPPER 1 #define CONFIG_INTRAX8 1 #define CONFIG_ISO_MEDIA 1 +#define CONFIG_ISO_WRITER 1 #define CONFIG_IVIDSP 1 #define CONFIG_JPEGTABLES 1 #define CONFIG_LGPLV3 0 @@ -956,6 +973,7 @@ #define CONFIG_VP3DSP 1 #define CONFIG_VP56DSP 1 #define CONFIG_VP8DSP 1 +#define CONFIG_VULKAN_ENCODE 0 #define CONFIG_WMA_FREQS 1 #define CONFIG_WMV2DSP 1 #endif /* SMP_CONFIG_H */ diff --git a/SMP/config_components.h b/SMP/config_components.h index d7c8800832015..7c8515da23f6d 100644 --- a/SMP/config_components.h +++ b/SMP/config_components.h @@ -29,9 +29,11 @@ #define CONFIG_CHOMP_BSF 1 #define CONFIG_DUMP_EXTRADATA_BSF 1 #define CONFIG_DCA_CORE_BSF 1 +#define CONFIG_DOVI_RPU_BSF 1 #define CONFIG_DTS2PTS_BSF 1 #define CONFIG_DV_ERROR_MARKER_BSF 1 #define CONFIG_EAC3_CORE_BSF 1 +#define CONFIG_EVC_FRAME_MERGE_BSF 1 #define CONFIG_EXTRACT_EXTRADATA_BSF 1 #define CONFIG_FILTER_UNITS_BSF 1 #define CONFIG_H264_METADATA_BSF 1 @@ -65,7 +67,6 @@ #define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 1 #define CONFIG_VVC_METADATA_BSF 1 #define CONFIG_VVC_MP4TOANNEXB_BSF 1 -#define CONFIG_EVC_FRAME_MERGE_BSF 1 #define CONFIG_AASC_DECODER 1 #define CONFIG_AIC_DECODER 1 #define CONFIG_ALIAS_PIX_DECODER 1 @@ -621,6 +622,7 @@ #define CONFIG_LIBGSM_MS_DECODER 0 #define CONFIG_LIBILBC_DECODER 1 #define CONFIG_LIBJXL_DECODER 0 +#define CONFIG_LIBLC3_DECODER 0 #define CONFIG_LIBOPENCORE_AMRNB_DECODER 0 #define CONFIG_LIBOPENCORE_AMRWB_DECODER 0 #define CONFIG_LIBOPUS_DECODER 1 @@ -635,6 +637,9 @@ #define CONFIG_BINTEXT_DECODER 1 #define CONFIG_XBIN_DECODER 1 #define CONFIG_IDF_DECODER 1 +#define CONFIG_AAC_MEDIACODEC_DECODER 0 +#define CONFIG_AMRNB_MEDIACODEC_DECODER 0 +#define CONFIG_AMRWB_MEDIACODEC_DECODER 0 #define CONFIG_LIBAOM_AV1_DECODER 0 #define CONFIG_AV1_DECODER 1 #if CONFIG_CUVID @@ -670,6 +675,7 @@ #else # define CONFIG_MJPEG_QSV_DECODER 0 #endif +#define CONFIG_MP3_MEDIACODEC_DECODER 0 #if CONFIG_CUVID # define CONFIG_MPEG1_CUVID_DECODER 1 #else @@ -713,6 +719,11 @@ #else # define CONFIG_VP9_QSV_DECODER 0 #endif +#if CONFIG_LIBMFX +# define CONFIG_VVC_QSV_DECODER 1 +#else +# define CONFIG_VVC_QSV_DECODER 0 +#endif #define CONFIG_VNULL_DECODER 1 #define CONFIG_ANULL_DECODER 1 #define CONFIG_A64MULTI_ENCODER 1 @@ -905,6 +916,7 @@ #define CONFIG_LIBGSM_MS_ENCODER 0 #define CONFIG_LIBILBC_ENCODER 1 #define CONFIG_LIBJXL_ENCODER 0 +#define CONFIG_LIBLC3_ENCODER 0 #define CONFIG_LIBMP3LAME_ENCODER 1 #define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0 #define CONFIG_LIBOPENJPEG_ENCODER 0 @@ -919,6 +931,7 @@ #define CONFIG_LIBVORBIS_ENCODER 1 #define CONFIG_LIBVPX_VP8_ENCODER 1 #define CONFIG_LIBVPX_VP9_ENCODER 1 +#define CONFIG_LIBVVENC_ENCODER 0 #define CONFIG_LIBWEBP_ANIM_ENCODER 0 #define CONFIG_LIBWEBP_ENCODER 0 #define CONFIG_LIBX262_ENCODER 0 @@ -966,11 +979,17 @@ #define CONFIG_H264_V4L2M2M_ENCODER 0 #define CONFIG_H264_VAAPI_ENCODER 0 #define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0 +#define CONFIG_H264_VULKAN_ENCODER 0 #if CONFIG_AMF # define CONFIG_HEVC_AMF_ENCODER 1 #else # define CONFIG_HEVC_AMF_ENCODER 0 #endif +#if CONFIG_D3D12VA_ENCODE +# define CONFIG_HEVC_D3D12VA_ENCODER 1 +#else +# define CONFIG_HEVC_D3D12VA_ENCODER 0 +#endif #define CONFIG_HEVC_MEDIACODEC_ENCODER 0 #define CONFIG_HEVC_MF_ENCODER 1 #if CONFIG_NVENC @@ -986,6 +1005,7 @@ #define CONFIG_HEVC_V4L2M2M_ENCODER 0 #define CONFIG_HEVC_VAAPI_ENCODER 0 #define CONFIG_HEVC_VIDEOTOOLBOX_ENCODER 0 +#define CONFIG_HEVC_VULKAN_ENCODER 0 #define CONFIG_LIBKVAZAAR_ENCODER 0 #if CONFIG_LIBMFX # define CONFIG_MJPEG_QSV_ENCODER 1 @@ -1583,7 +1603,7 @@ #define CONFIG_DEJUDDER_FILTER 1 #define CONFIG_DELOGO_FILTER 1 #define CONFIG_DENOISE_VAAPI_FILTER 0 -#define CONFIG_DERAIN_FILTER 1 +#define CONFIG_DERAIN_FILTER 0 #define CONFIG_DESHAKE_FILTER 1 #define CONFIG_DESHAKE_OPENCL_FILTER 0 #define CONFIG_DESPILL_FILTER 1 @@ -1591,9 +1611,9 @@ #define CONFIG_DILATION_FILTER 1 #define CONFIG_DILATION_OPENCL_FILTER 0 #define CONFIG_DISPLACE_FILTER 1 -#define CONFIG_DNN_CLASSIFY_FILTER 1 -#define CONFIG_DNN_DETECT_FILTER 1 -#define CONFIG_DNN_PROCESSING_FILTER 1 +#define CONFIG_DNN_CLASSIFY_FILTER 0 +#define CONFIG_DNN_DETECT_FILTER 0 +#define CONFIG_DNN_PROCESSING_FILTER 0 #define CONFIG_DOUBLEWEAVE_FILTER 1 #define CONFIG_DRAWBOX_FILTER 1 #define CONFIG_DRAWGRAPH_FILTER 1 @@ -1672,6 +1692,7 @@ #define CONFIG_KIRSCH_FILTER 1 #define CONFIG_LAGFUN_FILTER 1 #define CONFIG_LATENCY_FILTER 1 +#define CONFIG_LCEVC_FILTER 0 #define CONFIG_LENSCORRECTION_FILTER 1 #define CONFIG_LENSFUN_FILTER 0 #define CONFIG_LIBPLACEBO_FILTER 0 @@ -1813,7 +1834,7 @@ #define CONFIG_SOBEL_OPENCL_FILTER 0 #define CONFIG_SPLIT_FILTER 1 #define CONFIG_SPP_FILTER 1 -#define CONFIG_SR_FILTER 1 +#define CONFIG_SR_FILTER 0 #define CONFIG_SSIM_FILTER 1 #define CONFIG_SSIM360_FILTER 1 #define CONFIG_STEREO3D_FILTER 1 @@ -1879,6 +1900,7 @@ #define CONFIG_XFADE_OPENCL_FILTER 0 #define CONFIG_XFADE_VULKAN_FILTER 0 #define CONFIG_XMEDIAN_FILTER 1 +#define CONFIG_XPSNR_FILTER 1 #define CONFIG_XSTACK_FILTER 1 #define CONFIG_YADIF_FILTER 1 #define CONFIG_YADIF_CUDA_FILTER 0 @@ -1905,6 +1927,8 @@ #else # define CONFIG_XSTACK_QSV_FILTER 0 #endif +#define CONFIG_PAD_VAAPI_FILTER 0 +#define CONFIG_DRAWBOX_VAAPI_FILTER 0 #define CONFIG_ALLRGB_FILTER 1 #define CONFIG_ALLYUV_FILTER 1 #define CONFIG_CELLAUTO_FILTER 1 @@ -1929,6 +1953,7 @@ #define CONFIG_QRENCODESRC_FILTER 0 #define CONFIG_PAL75BARS_FILTER 1 #define CONFIG_PAL100BARS_FILTER 1 +#define CONFIG_PERLIN_FILTER 1 #define CONFIG_RGBTESTSRC_FILTER 1 #define CONFIG_SIERPINSKI_FILTER 1 #define CONFIG_SMPTEBARS_FILTER 1 @@ -2078,7 +2103,7 @@ #define CONFIG_HEVC_DEMUXER 1 #define CONFIG_HLS_DEMUXER 1 #define CONFIG_HNM_DEMUXER 1 -#define CONFIG_IAMF_DEMUXER 1 +#define CONFIG_IAMF_DEMUXER 0 #define CONFIG_ICO_DEMUXER 1 #define CONFIG_IDCIN_DEMUXER 1 #define CONFIG_IDF_DEMUXER 1 @@ -2104,6 +2129,7 @@ #define CONFIG_KUX_DEMUXER 1 #define CONFIG_KVAG_DEMUXER 1 #define CONFIG_LAF_DEMUXER 1 +#define CONFIG_LC3_DEMUXER 1 #define CONFIG_LMLM4_DEMUXER 1 #define CONFIG_LOAS_DEMUXER 1 #define CONFIG_LUODAT_DEMUXER 1 @@ -2187,6 +2213,7 @@ #define CONFIG_QOA_DEMUXER 1 #define CONFIG_R3D_DEMUXER 1 #define CONFIG_RAWVIDEO_DEMUXER 1 +#define CONFIG_RCWT_DEMUXER 1 #define CONFIG_REALTEXT_DEMUXER 1 #define CONFIG_REDSPARK_DEMUXER 1 #define CONFIG_RKA_DEMUXER 1 @@ -2385,7 +2412,7 @@ #define CONFIG_HDS_MUXER 1 #define CONFIG_HEVC_MUXER 1 #define CONFIG_HLS_MUXER 1 -#define CONFIG_IAMF_MUXER 1 +#define CONFIG_IAMF_MUXER 0 #define CONFIG_ICO_MUXER 1 #define CONFIG_ILBC_MUXER 1 #define CONFIG_IMAGE2_MUXER 1 @@ -2397,6 +2424,7 @@ #define CONFIG_JACOSUB_MUXER 1 #define CONFIG_KVAG_MUXER 1 #define CONFIG_LATM_MUXER 1 +#define CONFIG_LC3_MUXER 1 #define CONFIG_LRC_MUXER 1 #define CONFIG_M4V_MUXER 1 #define CONFIG_MD5_MUXER 1 diff --git a/SMP/ffmpeg.vcxproj b/SMP/ffmpeg.vcxproj index cfce06f750355..0f94d839472cf 100644 --- a/SMP/ffmpeg.vcxproj +++ b/SMP/ffmpeg.vcxproj @@ -248,7 +248,7 @@ Level3 WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true Default false @@ -259,6 +259,7 @@ false 4113;%(TreatSpecificWarningsAsErrors) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings) + stdc11 libavdeviced.lib;libavfilterd.lib;libavformatd.lib;libavcodecd.lib;libpostprocd.lib;libswresampled.lib;libswscaled.lib;libavutild.lib;libmfxd.lib;%(AdditionalDependencies) @@ -304,7 +305,7 @@ del ..\libavutil\ffversion.h Level3 WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true Default /Qvec- /Qsimd- %(AdditionalOptions) @@ -314,6 +315,7 @@ del ..\libavutil\ffversion.h false 4113;%(TreatSpecificWarningsAsErrors) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings) + stdc11 libavdeviced.lib;libavfilterd.lib;libavformatd.lib;libavcodecd.lib;libpostprocd.lib;libswresampled.lib;libswscaled.lib;libavutild.lib;libmfxd.lib;%(AdditionalDependencies) @@ -358,7 +360,7 @@ del ..\libavutil\ffversion.h Level3 WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;DEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true Default false @@ -369,6 +371,7 @@ del ..\libavutil\ffversion.h false 4113;%(TreatSpecificWarningsAsErrors) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings) + stdc11 avdeviced.lib;avfilterd.lib;avformatd.lib;avcodecd.lib;postprocd.lib;swresampled.lib;swscaled.lib;avutild.lib;mfxd.lib;%(AdditionalDependencies) @@ -414,7 +417,7 @@ del ..\libavutil\ffversion.h Level3 WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;DEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true Default /Qvec- /Qsimd- %(AdditionalOptions) @@ -424,6 +427,7 @@ del ..\libavutil\ffversion.h false 4113;%(TreatSpecificWarningsAsErrors) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings) + stdc11 avdeviced.lib;avfilterd.lib;avformatd.lib;avcodecd.lib;postprocd.lib;swresampled.lib;swscaled.lib;avutild.lib;mfxd.lib;%(AdditionalDependencies) @@ -471,7 +475,7 @@ del ..\libavutil\ffversion.h true true WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;NDEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true true true @@ -481,6 +485,7 @@ del ..\libavutil\ffversion.h Precise 4113;%(TreatSpecificWarningsAsErrors) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings) + stdc11 /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) @@ -531,7 +536,7 @@ del ..\libavutil\ffversion.h true true WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;NDEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true true true @@ -541,6 +546,7 @@ del ..\libavutil\ffversion.h Precise 4113;%(TreatSpecificWarningsAsErrors) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings) + stdc11 /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) @@ -589,7 +595,7 @@ del ..\libavutil\ffversion.h true true WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true true true @@ -600,6 +606,7 @@ del ..\libavutil\ffversion.h Precise 4113;%(TreatSpecificWarningsAsErrors) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings) + stdc11 /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) @@ -649,7 +656,7 @@ del ..\libavutil\ffversion.h true true WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true true true @@ -660,6 +667,7 @@ del ..\libavutil\ffversion.h Precise 4113;%(TreatSpecificWarningsAsErrors) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings) + stdc11 /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) diff --git a/SMP/ffplay.vcxproj b/SMP/ffplay.vcxproj index 26793ff0c8a3e..ccc6b98cb10bf 100644 --- a/SMP/ffplay.vcxproj +++ b/SMP/ffplay.vcxproj @@ -237,7 +237,7 @@ Level3 WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true Default false @@ -248,6 +248,7 @@ false 4113;%(TreatSpecificWarningsAsErrors) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings) + stdc11 libavdeviced.lib;libavfilterd.lib;libavformatd.lib;libavcodecd.lib;libpostprocd.lib;libswresampled.lib;libswscaled.lib;libavutild.lib;libsdl2d.lib;%(AdditionalDependencies) @@ -293,7 +294,7 @@ del ..\libavutil\ffversion.h Level3 WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true Default /Qvec- /Qsimd- %(AdditionalOptions) @@ -303,6 +304,7 @@ del ..\libavutil\ffversion.h false 4113;%(TreatSpecificWarningsAsErrors) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings) + stdc11 libavdeviced.lib;libavfilterd.lib;libavformatd.lib;libavcodecd.lib;libpostprocd.lib;libswresampled.lib;libswscaled.lib;libavutild.lib;libsdl2d.lib;%(AdditionalDependencies) @@ -347,7 +349,7 @@ del ..\libavutil\ffversion.h Level3 WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;DEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true Default false @@ -358,6 +360,7 @@ del ..\libavutil\ffversion.h false 4113;%(TreatSpecificWarningsAsErrors) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings) + stdc11 avdeviced.lib;avfilterd.lib;avformatd.lib;avcodecd.lib;postprocd.lib;swresampled.lib;swscaled.lib;avutild.lib;sdl2d.lib;%(AdditionalDependencies) @@ -403,7 +406,7 @@ del ..\libavutil\ffversion.h Level3 WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;DEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true Default /Qvec- /Qsimd- %(AdditionalOptions) @@ -413,6 +416,7 @@ del ..\libavutil\ffversion.h false 4113;%(TreatSpecificWarningsAsErrors) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings) + stdc11 avdeviced.lib;avfilterd.lib;avformatd.lib;avcodecd.lib;postprocd.lib;swresampled.lib;swscaled.lib;avutild.lib;sdl2d.lib;%(AdditionalDependencies) @@ -460,7 +464,7 @@ del ..\libavutil\ffversion.h true true WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;NDEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true true true @@ -470,6 +474,7 @@ del ..\libavutil\ffversion.h Precise 4113;%(TreatSpecificWarningsAsErrors) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings) + stdc11 /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) @@ -520,7 +525,7 @@ del ..\libavutil\ffversion.h true true WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;NDEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true true true @@ -530,6 +535,7 @@ del ..\libavutil\ffversion.h Precise 4113;%(TreatSpecificWarningsAsErrors) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings) + stdc11 /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) @@ -578,7 +584,7 @@ del ..\libavutil\ffversion.h true true WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true true true @@ -589,6 +595,7 @@ del ..\libavutil\ffversion.h Precise 4113;%(TreatSpecificWarningsAsErrors) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings) + stdc11 /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) @@ -638,7 +645,7 @@ del ..\libavutil\ffversion.h true true WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true true true @@ -649,6 +656,7 @@ del ..\libavutil\ffversion.h Precise 4113;%(TreatSpecificWarningsAsErrors) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings) + stdc11 /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) diff --git a/SMP/ffprobe.vcxproj b/SMP/ffprobe.vcxproj index 0b7e78590adde..956a80680b6c8 100644 --- a/SMP/ffprobe.vcxproj +++ b/SMP/ffprobe.vcxproj @@ -236,7 +236,7 @@ Level3 WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true Default false @@ -247,6 +247,7 @@ false 4113;%(TreatSpecificWarningsAsErrors) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings) + stdc11 libavdeviced.lib;libavfilterd.lib;libavformatd.lib;libavcodecd.lib;libpostprocd.lib;libswresampled.lib;libswscaled.lib;libavutild.lib;%(AdditionalDependencies) @@ -292,7 +293,7 @@ del ..\libavutil\ffversion.h Level3 WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true Default /Qvec- /Qsimd- %(AdditionalOptions) @@ -302,6 +303,7 @@ del ..\libavutil\ffversion.h false 4113;%(TreatSpecificWarningsAsErrors) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings) + stdc11 libavdeviced.lib;libavfilterd.lib;libavformatd.lib;libavcodecd.lib;libpostprocd.lib;libswresampled.lib;libswscaled.lib;libavutild.lib;%(AdditionalDependencies) @@ -346,7 +348,7 @@ del ..\libavutil\ffversion.h Level3 WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;DEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true Default false @@ -357,6 +359,7 @@ del ..\libavutil\ffversion.h false 4113;%(TreatSpecificWarningsAsErrors) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings) + stdc11 avdeviced.lib;avfilterd.lib;avformatd.lib;avcodecd.lib;postprocd.lib;swresampled.lib;swscaled.lib;avutild.lib;%(AdditionalDependencies) @@ -402,7 +405,7 @@ del ..\libavutil\ffversion.h Level3 WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;DEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true Default /Qvec- /Qsimd- %(AdditionalOptions) @@ -412,6 +415,7 @@ del ..\libavutil\ffversion.h false 4113;%(TreatSpecificWarningsAsErrors) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings) + stdc11 avdeviced.lib;avfilterd.lib;avformatd.lib;avcodecd.lib;postprocd.lib;swresampled.lib;swscaled.lib;avutild.lib;%(AdditionalDependencies) @@ -459,7 +463,7 @@ del ..\libavutil\ffversion.h true true WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;NDEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true true true @@ -469,6 +473,7 @@ del ..\libavutil\ffversion.h Precise 4113;%(TreatSpecificWarningsAsErrors) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings) + stdc11 /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) @@ -519,7 +524,7 @@ del ..\libavutil\ffversion.h true true WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;NDEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true true true @@ -529,6 +534,7 @@ del ..\libavutil\ffversion.h Precise 4113;%(TreatSpecificWarningsAsErrors) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings) + stdc11 /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) @@ -577,7 +583,7 @@ del ..\libavutil\ffversion.h true true WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true true true @@ -588,6 +594,7 @@ del ..\libavutil\ffversion.h Precise 4113;%(TreatSpecificWarningsAsErrors) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings) + stdc11 /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) @@ -637,7 +644,7 @@ del ..\libavutil\ffversion.h true true WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true true true @@ -648,6 +655,7 @@ del ..\libavutil\ffversion.h Precise 4113;%(TreatSpecificWarningsAsErrors) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings) + stdc11 /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) diff --git a/SMP/libavcodec.def b/SMP/libavcodec.def index 0a156135c0f49..5d31fc9b84ff8 100644 --- a/SMP/libavcodec.def +++ b/SMP/libavcodec.def @@ -126,6 +126,7 @@ EXPORTS avcodec_get_hw_frames_parameters avcodec_get_name avcodec_get_subtitle_rect_class + avcodec_get_supported_config avcodec_get_type avcodec_is_open avcodec_license diff --git a/SMP/libavcodec.vcxproj b/SMP/libavcodec.vcxproj index 0ab949fbccb7e..7835185aa9718 100644 --- a/SMP/libavcodec.vcxproj +++ b/SMP/libavcodec.vcxproj @@ -14,10 +14,11 @@ ILBC_STATIC_DEFINE;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libbz2d.lib;libiconvd.lib;liblzmad.lib;libzlibd.lib;libx264d.lib;libx265d.lib;libxvidcored.lib;libilbcd.lib;libmp3lamed.lib;libopusd.lib;libspeexd.lib;libtheorad.lib;libvorbisd.lib;libvpxd.lib;libmfxd.lib;mfplat.lib;mfuuid.lib;strmiids.lib;%(AdditionalDependencies) @@ -84,17 +85,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) ILBC_STATIC_DEFINE;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) ILBC_STATIC_DEFINE;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libbz2d.lib;libiconvd.lib;liblzmad.lib;libzlibd.lib;libx264d.lib;libx265d.lib;libxvidcored.lib;libilbcd.lib;libmp3lamed.lib;libopusd.lib;libspeexd.lib;libtheorad.lib;libvorbisd.lib;libvpxd.lib;libmfxd.lib;mfplat.lib;mfuuid.lib;strmiids.lib;%(AdditionalDependencies) @@ -161,17 +163,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) ILBC_STATIC_DEFINE;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) X264_API_IMPORTS;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutild.lib;swresampled.lib;bz2d.lib;iconvd.lib;lzmad.lib;zlibd.lib;x264d.lib;x265d.lib;xvidcored.lib;ilbcd.lib;mp3lamed.lib;opusd.lib;speexd.lib;theorad.lib;vorbisd.lib;vpxd.lib;mfxd.lib;mfplat.lib;mfuuid.lib;strmiids.lib;%(AdditionalDependencies) @@ -239,17 +242,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) X264_API_IMPORTS;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) X264_API_IMPORTS;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutild.lib;swresampled.lib;bz2d.lib;iconvd.lib;lzmad.lib;zlibd.lib;x264d.lib;x265d.lib;xvidcored.lib;ilbcd.lib;mp3lamed.lib;opusd.lib;speexd.lib;theorad.lib;vorbisd.lib;vpxd.lib;mfxd.lib;mfplat.lib;mfuuid.lib;strmiids.lib;%(AdditionalDependencies) @@ -317,17 +321,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) X264_API_IMPORTS;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) ILBC_STATIC_DEFINE;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libbz2.lib;libiconv.lib;liblzma.lib;libzlib.lib;libx264.lib;libx265.lib;libxvidcore.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libmfx.lib;mfplat.lib;mfuuid.lib;strmiids.lib;%(AdditionalDependencies) @@ -394,17 +399,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) ILBC_STATIC_DEFINE;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) ILBC_STATIC_DEFINE;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libbz2.lib;libiconv.lib;liblzma.lib;libzlib.lib;libx264.lib;libx265.lib;libxvidcore.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libmfx.lib;mfplat.lib;mfuuid.lib;strmiids.lib;%(AdditionalDependencies) @@ -471,17 +477,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) ILBC_STATIC_DEFINE;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) X264_API_IMPORTS;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil.lib;swresample.lib;bz2.lib;iconv.lib;lzma.lib;zlib.lib;x264.lib;x265.lib;xvidcore.lib;ilbc.lib;mp3lame.lib;opus.lib;speex.lib;theora.lib;vorbis.lib;vpx.lib;mfx.lib;mfplat.lib;mfuuid.lib;strmiids.lib;%(AdditionalDependencies) @@ -549,17 +556,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) X264_API_IMPORTS;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) X264_API_IMPORTS;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil.lib;swresample.lib;bz2.lib;iconv.lib;lzma.lib;zlib.lib;x264.lib;x265.lib;xvidcore.lib;ilbc.lib;mp3lame.lib;opus.lib;speex.lib;theora.lib;vorbis.lib;vpx.lib;mfx.lib;mfplat.lib;mfuuid.lib;strmiids.lib;%(AdditionalDependencies) @@ -627,17 +635,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) X264_API_IMPORTS;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) ILBC_STATIC_DEFINE;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil.lib;swresample.lib;libbz2.lib;libiconv.lib;liblzma.lib;libzlib.lib;libx264.lib;libx265.lib;libxvidcore.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libmfx.lib;mfplat.lib;mfuuid.lib;strmiids.lib;%(AdditionalDependencies) @@ -705,17 +714,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) ILBC_STATIC_DEFINE;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) ILBC_STATIC_DEFINE;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil.lib;swresample.lib;libbz2.lib;libiconv.lib;liblzma.lib;libzlib.lib;libx264.lib;libx265.lib;libxvidcore.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libmfx.lib;mfplat.lib;mfuuid.lib;strmiids.lib;%(AdditionalDependencies) @@ -783,7 +793,7 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) ILBC_STATIC_DEFINE;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters index beef9266d5eca..f78cc9ffcb17f 100644 --- a/SMP/libavcodec.vcxproj.filters +++ b/SMP/libavcodec.vcxproj.filters @@ -19,21 +19,30 @@ {bf017c32-250d-47da-b7e6-d5a5091cb1e6} - + {fd9e10e9-18f6-437d-b5d7-17290540c8b8} - + {f026e68e-ff14-4bf4-8758-6384ac7bcfaf} - + {a2d068fe-f5d5-4b6f-95d4-f15631533341} - + {8a4a673d-2aba-4d8d-a18e-dab035e5c446} - + {0dcfb38d-54ca-4ceb-b383-4662f006eca9} + + {57bf1423-fb68-441f-b5c1-f41e6ae5fa9c} + + + {bda0568e-a423-4fcc-affe-6ba7c2a40f78} + + + {60d9e8db-aa53-43bc-852b-44f83e68a787} + @@ -46,9 +55,21 @@ + + Source Files\libavcodec\x86\vvc + + + Source Files\libavcodec\x86\vvc + Source Files\libavcodec\x86\vvc + + Source Files\libavcodec\x86\vvc + + + Source Files\libavcodec\x86\vvc + Source Files\libavcodec\x86\h26x @@ -352,7 +373,7 @@ Source Files\libavcodec - + Source Files\libavcodec @@ -394,6 +415,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -424,6 +448,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -499,6 +526,12 @@ Source Files\libavcodec + + Source Files\libavcodec + + + Source Files\libavcodec + Source Files\libavcodec @@ -550,6 +583,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -568,24 +604,12 @@ Source Files\libavcodec - - Source Files\libavcodec - - - Source Files\libavcodec - - - Source Files\libavcodec - - + Source Files\libavcodec Source Files\libavcodec - - Source Files\libavcodec - Source Files\libavcodec @@ -601,7 +625,7 @@ Source Files\libavcodec - + Source Files\libavcodec @@ -697,7 +721,7 @@ Source Files\libavcodec - + Source Files\libavcodec @@ -751,12 +775,6 @@ Source Files\libavcodec - - Source Files\libavcodec - - - Source Files\libavcodec - Source Files\libavcodec @@ -778,9 +796,6 @@ Source Files\libavcodec - - Source Files\libavcodec - Source Files\libavcodec @@ -1087,6 +1102,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -1186,9 +1204,6 @@ Source Files\libavcodec - - Source Files\libavcodec - Source Files\libavcodec @@ -1525,9 +1540,6 @@ Source Files\libavcodec - - Source Files\libavcodec - Source Files\libavcodec @@ -1549,25 +1561,7 @@ Source Files\libavcodec - - Source Files\libavcodec - - - Source Files\libavcodec - - - Source Files\libavcodec - - - Source Files\libavcodec - - - Source Files\libavcodec - - - Source Files\libavcodec - - + Source Files\libavcodec @@ -1888,39 +1882,9 @@ Source Files\libavcodec - - Source Files\libavcodec - - - Source Files\libavcodec - - - Source Files\libavcodec - - - Source Files\libavcodec - - - Source Files\libavcodec - - - Source Files\libavcodec - Source Files\libavcodec - - Source Files\libavcodec - - - Source Files\libavcodec - - - Source Files\libavcodec - - - Source Files\libavcodec - Source Files\libavcodec @@ -1969,7 +1933,7 @@ Source Files\libavcodec - + Source Files\libavcodec @@ -2776,9 +2740,6 @@ Source Files\libavcodec - - Source Files\libavcodec - Source Files\libavcodec @@ -2815,9 +2776,6 @@ Source Files\libavcodec - - Source Files\libavcodec - Source Files\libavcodec @@ -3016,47 +2974,101 @@ Source Files\libavcodec\x86\h26x - + Source Files\libavcodec\vvc - + Source Files\libavcodec\vvc - + Source Files\libavcodec\vvc - + Source Files\libavcodec\vvc - + Source Files\libavcodec\vvc - + Source Files\libavcodec\vvc - + Source Files\libavcodec\vvc - + Source Files\libavcodec\vvc - + Source Files\libavcodec\vvc - + Source Files\libavcodec\vvc - + Source Files\libavcodec\vvc - + Source Files\libavcodec\vvc - + Source Files\libavcodec\vvc - - Source Files\libavcodec\vvc + + Source Files\libavcodec\opus + + + Source Files\libavcodec\opus + + + Source Files\libavcodec\opus + + + Source Files\libavcodec\opus + + + Source Files\libavcodec\opus + + + Source Files\libavcodec\opus + + + Source Files\libavcodec\opus + + + Source Files\libavcodec\opus + + + Source Files\libavcodec\opus + + + Source Files\libavcodec\hevc + + + Source Files\libavcodec\hevc + + + Source Files\libavcodec\hevc + + + Source Files\libavcodec\aac + + + Source Files\libavcodec\aac + + + Source Files\libavcodec\aac + + + Source Files\libavcodec\aac + + + Source Files\libavcodec\aac + + + Source Files\libavcodec\aac + + + Source Files\libavcodec\aac Source Files\libavcodec\x86 @@ -3292,6 +3304,12 @@ Source Files\libavcodec + + Source Files\libavcodec + + + Source Files\libavcodec + Source Files\libavcodec @@ -3328,7 +3346,10 @@ Source Files\libavcodec - + + Source Files\libavcodec\hevc + + Source Files\libavcodec @@ -3511,9 +3532,6 @@ Source Files\libavcodec - - Source Files\libavcodec - Source Files\libavcodec @@ -3556,9 +3574,51 @@ Source Files\libavcodec\bsf + + Source Files\libavcodec\bsf + Source Files\libavcodec\bsf + + Source Files\libavcodec\vvc + + + Source Files\libavcodec\opus + + + Source Files\libavcodec\opus + + + Source Files\libavcodec\opus + + + Source Files\libavcodec\hevc + + + Source Files\libavcodec\hevc + + + Source Files\libavcodec\hevc + + + Source Files\libavcodec\hevc + + + Source Files\libavcodec\hevc + + + Source Files\libavcodec\hevc + + + Source Files\libavcodec\hevc + + + Source Files\libavcodec\hevc + + + Source Files\libavcodec\hevc + Source Files\libavcodec\x86 diff --git a/SMP/libavcodec/bsf_list.c b/SMP/libavcodec/bsf_list.c index 76a9fb6ae4ff2..9a10f16415322 100644 --- a/SMP/libavcodec/bsf_list.c +++ b/SMP/libavcodec/bsf_list.c @@ -28,9 +28,11 @@ static const FFBitStreamFilter *bitstream_filters[] = { &ff_chomp_bsf, &ff_dump_extradata_bsf, &ff_dca_core_bsf, + &ff_dovi_rpu_bsf, &ff_dts2pts_bsf, &ff_dv_error_marker_bsf, &ff_eac3_core_bsf, + &ff_evc_frame_merge_bsf, &ff_extract_extradata_bsf, &ff_filter_units_bsf, &ff_h264_metadata_bsf, @@ -64,5 +66,4 @@ static const FFBitStreamFilter *bitstream_filters[] = { &ff_vp9_superframe_split_bsf, &ff_vvc_metadata_bsf, &ff_vvc_mp4toannexb_bsf, - &ff_evc_frame_merge_bsf, NULL }; \ No newline at end of file diff --git a/SMP/libavcodec/codec_list.c b/SMP/libavcodec/codec_list.c index 6b8974273e991..1179211f8ef06 100644 --- a/SMP/libavcodec/codec_list.c +++ b/SMP/libavcodec/codec_list.c @@ -229,6 +229,9 @@ static const FFCodec *codec_list[] = { #endif #if CONFIG_HEVC_AMF_ENCODER &ff_hevc_amf_encoder, +#endif +#if CONFIG_HEVC_D3D12VA_ENCODER + &ff_hevc_d3d12va_encoder, #endif &ff_hevc_mf_encoder, #if CONFIG_HEVC_NVENC_ENCODER @@ -802,6 +805,9 @@ static const FFCodec *codec_list[] = { #endif #if CONFIG_VP9_QSV_DECODER &ff_vp9_qsv_decoder, +#endif +#if CONFIG_VVC_QSV_DECODER + &ff_vvc_qsv_decoder, #endif &ff_vnull_decoder, &ff_anull_decoder, diff --git a/SMP/libswscale/dce_defs.c b/SMP/libavcodec/d3d12va_encode_hevc_wrap.c similarity index 79% rename from SMP/libswscale/dce_defs.c rename to SMP/libavcodec/d3d12va_encode_hevc_wrap.c index cbe6d5b5e7178..885de6218ac42 100644 --- a/SMP/libswscale/dce_defs.c +++ b/SMP/libavcodec/d3d12va_encode_hevc_wrap.c @@ -1,4 +1,4 @@ -/** libswscale DCE definitions +/** d3d12va_encode_hevc.c file wrapper for libavcodec * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -20,16 +20,7 @@ */ #include "config.h" -#include "stdint.h" #include "config_components.h" - - -#if !(HAVE_AVX_INLINE) -void rgb2rgb_init_avx() {return;} -#endif -#if !(HAVE_MMXEXT_INLINE) -void rgb2rgb_init_mmxext() {return;} -#endif -#if !(HAVE_SSE2_INLINE) -void rgb2rgb_init_sse2() {return;} -#endif +#if CONFIG_HEVC_D3D12VA_ENCODER +# include "../../libavcodec/d3d12va_encode_hevc.c" +#endif \ No newline at end of file diff --git a/SMP/libavcodec/d3d12va_encode_wrap.c b/SMP/libavcodec/d3d12va_encode_wrap.c new file mode 100644 index 0000000000000..0d54499a784d6 --- /dev/null +++ b/SMP/libavcodec/d3d12va_encode_wrap.c @@ -0,0 +1,26 @@ +/** d3d12va_encode.c file wrapper for libavcodec + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "config.h" +#include "config_components.h" +#if CONFIG_D3D12VA_ENCODE +# include "../../libavcodec/d3d12va_encode.c" +#endif \ No newline at end of file diff --git a/SMP/libavcodec/hevc_ps_enc_wrap.c b/SMP/libavcodec/hevc/ps_enc_wrap.c similarity index 90% rename from SMP/libavcodec/hevc_ps_enc_wrap.c rename to SMP/libavcodec/hevc/ps_enc_wrap.c index ee8927ffa514a..3b8b865dc9f91 100644 --- a/SMP/libavcodec/hevc_ps_enc_wrap.c +++ b/SMP/libavcodec/hevc/ps_enc_wrap.c @@ -1,4 +1,4 @@ -/** hevc_ps_enc.c file wrapper for libavcodec +/** hevc/ps_enc.c file wrapper for libavcodec * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,5 +22,5 @@ #include "config.h" #include "config_components.h" #if CONFIG_HEVC_QSV_ENCODER -# include "../../libavcodec/hevc_ps_enc.c" +# include "../../libavcodec/hevc/ps_enc.c" #endif \ No newline at end of file diff --git a/SMP/libavcodec/hw_base_encode_wrap.c b/SMP/libavcodec/hw_base_encode_wrap.c new file mode 100644 index 0000000000000..6cd4b9d761e0f --- /dev/null +++ b/SMP/libavcodec/hw_base_encode_wrap.c @@ -0,0 +1,26 @@ +/** hw_base_encode.c file wrapper for libavcodec + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "config.h" +#include "config_components.h" +#if CONFIG_D3D12VA_ENCODE +# include "../../libavcodec/hw_base_encode.c" +#endif \ No newline at end of file diff --git a/SMP/libavcodec_files.props b/SMP/libavcodec_files.props index da6edb6337801..20b12dfcd6f1e 100644 --- a/SMP/libavcodec_files.props +++ b/SMP/libavcodec_files.props @@ -12,7 +12,11 @@ + + + + @@ -122,7 +126,7 @@ - + @@ -136,6 +140,7 @@ + @@ -146,6 +151,7 @@ + @@ -171,6 +177,8 @@ + + @@ -188,24 +196,21 @@ + - - - - - + - + @@ -237,7 +242,7 @@ - + @@ -255,8 +260,6 @@ - - @@ -264,7 +267,6 @@ - @@ -367,6 +369,7 @@ + @@ -400,7 +403,6 @@ - @@ -513,7 +515,6 @@ - @@ -521,13 +522,7 @@ - - - - - - - + @@ -634,17 +629,7 @@ - - - - - - - - - - @@ -661,7 +646,7 @@ - + @@ -930,7 +915,6 @@ - @@ -943,7 +927,6 @@ - @@ -1010,20 +993,38 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1102,6 +1103,8 @@ + + @@ -1114,7 +1117,8 @@ - + + @@ -1249,9 +1253,6 @@ $(IntDir)\libavcodec_xvididct.obj - - $(IntDir)\libavcodec_opusdsp.obj - $(IntDir)\libavcodec_proresdsp.obj @@ -1294,9 +1295,51 @@ $(IntDir)\libavcodec_bsf_dca_core.obj + + $(IntDir)\libavcodec_bsf_dovi_rpu.obj + $(IntDir)\libavcodec_bsf_null.obj + + $(IntDir)\libavcodec_vvc_cabac.obj + + + $(IntDir)\libavcodec_opus_dec.obj + + + $(IntDir)\libavcodec_opus_dsp.obj + + + $(IntDir)\libavcodec_opus_parser.obj + + + $(IntDir)\libavcodec_hevc_cabac.obj + + + $(IntDir)\libavcodec_hevc_data.obj + + + $(IntDir)\libavcodec_hevc_dsp.obj + + + $(IntDir)\libavcodec_hevc_filter.obj + + + $(IntDir)\libavcodec_hevc_mvs.obj + + + $(IntDir)\libavcodec_hevc_refs.obj + + + $(IntDir)\libavcodec_hevc_parser.obj + + + $(IntDir)\libavcodec_hevc_parse.obj + + + $(IntDir)\libavcodec_hevc_ps.obj + $(IntDir)\libavcodec_x86_mpegaudiodsp.obj diff --git a/SMP/libavcodec_winrt.vcxproj b/SMP/libavcodec_winrt.vcxproj index aa9d821a7dcb0..5b83b62636c86 100644 --- a/SMP/libavcodec_winrt.vcxproj +++ b/SMP/libavcodec_winrt.vcxproj @@ -14,10 +14,11 @@ ILBC_STATIC_DEFINE;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libbz2d_winrt.lib;libiconvd_winrt.lib;liblzmad_winrt.lib;libzlibd_winrt.lib;libx264d_winrt.lib;libx265d_winrt.lib;libxvidcored_winrt.lib;libilbcd_winrt.lib;libmp3lamed_winrt.lib;libopusd_winrt.lib;libspeexd_winrt.lib;libtheorad_winrt.lib;libvorbisd_winrt.lib;libvpxd_winrt.lib;mfplat.lib;mfuuid.lib;dxgi.lib;d3d11.lib;d3d12.lib;%(AdditionalDependencies) @@ -84,17 +85,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) ILBC_STATIC_DEFINE;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) ILBC_STATIC_DEFINE;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libbz2d_winrt.lib;libiconvd_winrt.lib;liblzmad_winrt.lib;libzlibd_winrt.lib;libx264d_winrt.lib;libx265d_winrt.lib;libxvidcored_winrt.lib;libilbcd_winrt.lib;libmp3lamed_winrt.lib;libopusd_winrt.lib;libspeexd_winrt.lib;libtheorad_winrt.lib;libvorbisd_winrt.lib;libvpxd_winrt.lib;mfplat.lib;mfuuid.lib;dxgi.lib;d3d11.lib;d3d12.lib;%(AdditionalDependencies) @@ -161,17 +163,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) ILBC_STATIC_DEFINE;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) X264_API_IMPORTS;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutild_winrt.lib;swresampled_winrt.lib;bz2d_winrt.lib;iconvd_winrt.lib;lzmad_winrt.lib;zlibd_winrt.lib;x264d_winrt.lib;x265d_winrt.lib;xvidcored_winrt.lib;ilbcd_winrt.lib;mp3lamed_winrt.lib;opusd_winrt.lib;speexd_winrt.lib;theorad_winrt.lib;vorbisd_winrt.lib;vpxd_winrt.lib;mfplat.lib;mfuuid.lib;dxgi.lib;d3d11.lib;d3d12.lib;%(AdditionalDependencies) @@ -239,17 +242,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) X264_API_IMPORTS;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) X264_API_IMPORTS;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutild_winrt.lib;swresampled_winrt.lib;bz2d_winrt.lib;iconvd_winrt.lib;lzmad_winrt.lib;zlibd_winrt.lib;x264d_winrt.lib;x265d_winrt.lib;xvidcored_winrt.lib;ilbcd_winrt.lib;mp3lamed_winrt.lib;opusd_winrt.lib;speexd_winrt.lib;theorad_winrt.lib;vorbisd_winrt.lib;vpxd_winrt.lib;mfplat.lib;mfuuid.lib;dxgi.lib;d3d11.lib;d3d12.lib;%(AdditionalDependencies) @@ -317,17 +321,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) X264_API_IMPORTS;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) ILBC_STATIC_DEFINE;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libbz2_winrt.lib;libiconv_winrt.lib;liblzma_winrt.lib;libzlib_winrt.lib;libx264_winrt.lib;libx265_winrt.lib;libxvidcore_winrt.lib;libilbc_winrt.lib;libmp3lame_winrt.lib;libopus_winrt.lib;libspeex_winrt.lib;libtheora_winrt.lib;libvorbis_winrt.lib;libvpx_winrt.lib;mfplat.lib;mfuuid.lib;dxgi.lib;d3d11.lib;d3d12.lib;%(AdditionalDependencies) @@ -394,17 +399,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) ILBC_STATIC_DEFINE;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) ILBC_STATIC_DEFINE;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libbz2_winrt.lib;libiconv_winrt.lib;liblzma_winrt.lib;libzlib_winrt.lib;libx264_winrt.lib;libx265_winrt.lib;libxvidcore_winrt.lib;libilbc_winrt.lib;libmp3lame_winrt.lib;libopus_winrt.lib;libspeex_winrt.lib;libtheora_winrt.lib;libvorbis_winrt.lib;libvpx_winrt.lib;mfplat.lib;mfuuid.lib;dxgi.lib;d3d11.lib;d3d12.lib;%(AdditionalDependencies) @@ -471,17 +477,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) ILBC_STATIC_DEFINE;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) X264_API_IMPORTS;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil_winrt.lib;swresample_winrt.lib;bz2_winrt.lib;iconv_winrt.lib;lzma_winrt.lib;zlib_winrt.lib;x264_winrt.lib;x265_winrt.lib;xvidcore_winrt.lib;ilbc_winrt.lib;mp3lame_winrt.lib;opus_winrt.lib;speex_winrt.lib;theora_winrt.lib;vorbis_winrt.lib;vpx_winrt.lib;mfplat.lib;mfuuid.lib;dxgi.lib;d3d11.lib;d3d12.lib;%(AdditionalDependencies) @@ -549,17 +556,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) X264_API_IMPORTS;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) X264_API_IMPORTS;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil_winrt.lib;swresample_winrt.lib;bz2_winrt.lib;iconv_winrt.lib;lzma_winrt.lib;zlib_winrt.lib;x264_winrt.lib;x265_winrt.lib;xvidcore_winrt.lib;ilbc_winrt.lib;mp3lame_winrt.lib;opus_winrt.lib;speex_winrt.lib;theora_winrt.lib;vorbis_winrt.lib;vpx_winrt.lib;mfplat.lib;mfuuid.lib;dxgi.lib;d3d11.lib;d3d12.lib;%(AdditionalDependencies) @@ -627,17 +635,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) X264_API_IMPORTS;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) ILBC_STATIC_DEFINE;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil_winrt.lib;swresample_winrt.lib;libbz2_winrt.lib;libiconv_winrt.lib;liblzma_winrt.lib;libzlib_winrt.lib;libx264_winrt.lib;libx265_winrt.lib;libxvidcore_winrt.lib;libilbc_winrt.lib;libmp3lame_winrt.lib;libopus_winrt.lib;libspeex_winrt.lib;libtheora_winrt.lib;libvorbis_winrt.lib;libvpx_winrt.lib;mfplat.lib;mfuuid.lib;dxgi.lib;d3d11.lib;d3d12.lib;%(AdditionalDependencies) @@ -705,17 +714,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) ILBC_STATIC_DEFINE;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) ILBC_STATIC_DEFINE;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil_winrt.lib;swresample_winrt.lib;libbz2_winrt.lib;libiconv_winrt.lib;liblzma_winrt.lib;libzlib_winrt.lib;libx264_winrt.lib;libx265_winrt.lib;libxvidcore_winrt.lib;libilbc_winrt.lib;libmp3lame_winrt.lib;libopus_winrt.lib;libspeex_winrt.lib;libtheora_winrt.lib;libvorbis_winrt.lib;libvpx_winrt.lib;mfplat.lib;mfuuid.lib;dxgi.lib;d3d11.lib;d3d12.lib;%(AdditionalDependencies) @@ -783,7 +793,7 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\vvc\;$(ProjectDir)\..\libavcodec\x86\vvc\;$(ProjectDir)\..\libavcodec\bsf\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;$(OutDir)\include\opus\;$(ProjectDir)\..\..\prebuilt\include\opus\;.\;..\;%(AdditionalIncludeDirectories) ILBC_STATIC_DEFINE;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) diff --git a/SMP/libavcodec_winrt.vcxproj.filters b/SMP/libavcodec_winrt.vcxproj.filters index beef9266d5eca..f78cc9ffcb17f 100644 --- a/SMP/libavcodec_winrt.vcxproj.filters +++ b/SMP/libavcodec_winrt.vcxproj.filters @@ -19,21 +19,30 @@ {bf017c32-250d-47da-b7e6-d5a5091cb1e6} - + {fd9e10e9-18f6-437d-b5d7-17290540c8b8} - + {f026e68e-ff14-4bf4-8758-6384ac7bcfaf} - + {a2d068fe-f5d5-4b6f-95d4-f15631533341} - + {8a4a673d-2aba-4d8d-a18e-dab035e5c446} - + {0dcfb38d-54ca-4ceb-b383-4662f006eca9} + + {57bf1423-fb68-441f-b5c1-f41e6ae5fa9c} + + + {bda0568e-a423-4fcc-affe-6ba7c2a40f78} + + + {60d9e8db-aa53-43bc-852b-44f83e68a787} + @@ -46,9 +55,21 @@ + + Source Files\libavcodec\x86\vvc + + + Source Files\libavcodec\x86\vvc + Source Files\libavcodec\x86\vvc + + Source Files\libavcodec\x86\vvc + + + Source Files\libavcodec\x86\vvc + Source Files\libavcodec\x86\h26x @@ -352,7 +373,7 @@ Source Files\libavcodec - + Source Files\libavcodec @@ -394,6 +415,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -424,6 +448,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -499,6 +526,12 @@ Source Files\libavcodec + + Source Files\libavcodec + + + Source Files\libavcodec + Source Files\libavcodec @@ -550,6 +583,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -568,24 +604,12 @@ Source Files\libavcodec - - Source Files\libavcodec - - - Source Files\libavcodec - - - Source Files\libavcodec - - + Source Files\libavcodec Source Files\libavcodec - - Source Files\libavcodec - Source Files\libavcodec @@ -601,7 +625,7 @@ Source Files\libavcodec - + Source Files\libavcodec @@ -697,7 +721,7 @@ Source Files\libavcodec - + Source Files\libavcodec @@ -751,12 +775,6 @@ Source Files\libavcodec - - Source Files\libavcodec - - - Source Files\libavcodec - Source Files\libavcodec @@ -778,9 +796,6 @@ Source Files\libavcodec - - Source Files\libavcodec - Source Files\libavcodec @@ -1087,6 +1102,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -1186,9 +1204,6 @@ Source Files\libavcodec - - Source Files\libavcodec - Source Files\libavcodec @@ -1525,9 +1540,6 @@ Source Files\libavcodec - - Source Files\libavcodec - Source Files\libavcodec @@ -1549,25 +1561,7 @@ Source Files\libavcodec - - Source Files\libavcodec - - - Source Files\libavcodec - - - Source Files\libavcodec - - - Source Files\libavcodec - - - Source Files\libavcodec - - - Source Files\libavcodec - - + Source Files\libavcodec @@ -1888,39 +1882,9 @@ Source Files\libavcodec - - Source Files\libavcodec - - - Source Files\libavcodec - - - Source Files\libavcodec - - - Source Files\libavcodec - - - Source Files\libavcodec - - - Source Files\libavcodec - Source Files\libavcodec - - Source Files\libavcodec - - - Source Files\libavcodec - - - Source Files\libavcodec - - - Source Files\libavcodec - Source Files\libavcodec @@ -1969,7 +1933,7 @@ Source Files\libavcodec - + Source Files\libavcodec @@ -2776,9 +2740,6 @@ Source Files\libavcodec - - Source Files\libavcodec - Source Files\libavcodec @@ -2815,9 +2776,6 @@ Source Files\libavcodec - - Source Files\libavcodec - Source Files\libavcodec @@ -3016,47 +2974,101 @@ Source Files\libavcodec\x86\h26x - + Source Files\libavcodec\vvc - + Source Files\libavcodec\vvc - + Source Files\libavcodec\vvc - + Source Files\libavcodec\vvc - + Source Files\libavcodec\vvc - + Source Files\libavcodec\vvc - + Source Files\libavcodec\vvc - + Source Files\libavcodec\vvc - + Source Files\libavcodec\vvc - + Source Files\libavcodec\vvc - + Source Files\libavcodec\vvc - + Source Files\libavcodec\vvc - + Source Files\libavcodec\vvc - - Source Files\libavcodec\vvc + + Source Files\libavcodec\opus + + + Source Files\libavcodec\opus + + + Source Files\libavcodec\opus + + + Source Files\libavcodec\opus + + + Source Files\libavcodec\opus + + + Source Files\libavcodec\opus + + + Source Files\libavcodec\opus + + + Source Files\libavcodec\opus + + + Source Files\libavcodec\opus + + + Source Files\libavcodec\hevc + + + Source Files\libavcodec\hevc + + + Source Files\libavcodec\hevc + + + Source Files\libavcodec\aac + + + Source Files\libavcodec\aac + + + Source Files\libavcodec\aac + + + Source Files\libavcodec\aac + + + Source Files\libavcodec\aac + + + Source Files\libavcodec\aac + + + Source Files\libavcodec\aac Source Files\libavcodec\x86 @@ -3292,6 +3304,12 @@ Source Files\libavcodec + + Source Files\libavcodec + + + Source Files\libavcodec + Source Files\libavcodec @@ -3328,7 +3346,10 @@ Source Files\libavcodec - + + Source Files\libavcodec\hevc + + Source Files\libavcodec @@ -3511,9 +3532,6 @@ Source Files\libavcodec - - Source Files\libavcodec - Source Files\libavcodec @@ -3556,9 +3574,51 @@ Source Files\libavcodec\bsf + + Source Files\libavcodec\bsf + Source Files\libavcodec\bsf + + Source Files\libavcodec\vvc + + + Source Files\libavcodec\opus + + + Source Files\libavcodec\opus + + + Source Files\libavcodec\opus + + + Source Files\libavcodec\hevc + + + Source Files\libavcodec\hevc + + + Source Files\libavcodec\hevc + + + Source Files\libavcodec\hevc + + + Source Files\libavcodec\hevc + + + Source Files\libavcodec\hevc + + + Source Files\libavcodec\hevc + + + Source Files\libavcodec\hevc + + + Source Files\libavcodec\hevc + Source Files\libavcodec\x86 diff --git a/SMP/libavdevice.vcxproj b/SMP/libavdevice.vcxproj index b600800f417f2..ee3ee12bd3c8a 100644 --- a/SMP/libavdevice.vcxproj +++ b/SMP/libavdevice.vcxproj @@ -11,10 +11,11 @@ _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libsdl2d.lib;libcdio_paranoiad.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies) @@ -55,17 +56,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libsdl2d.lib;libcdio_paranoiad.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies) @@ -106,17 +108,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avformatd.lib;avcodecd.lib;avutild.lib;avfilterd.lib;sdl2d.lib;cdio_paranoiad.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies) @@ -158,17 +161,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avformatd.lib;avcodecd.lib;avutild.lib;avfilterd.lib;sdl2d.lib;cdio_paranoiad.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies) @@ -210,17 +214,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libsdl2.lib;libcdio_paranoia.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies) @@ -261,17 +266,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libsdl2.lib;libcdio_paranoia.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies) @@ -312,17 +318,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;sdl2.lib;cdio_paranoia.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies) @@ -364,17 +371,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;sdl2.lib;cdio_paranoia.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies) @@ -416,17 +424,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;libsdl2.lib;libcdio_paranoia.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies) @@ -468,17 +477,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;libsdl2.lib;libcdio_paranoia.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies) @@ -520,7 +530,7 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) diff --git a/SMP/libavdevice_winrt.vcxproj b/SMP/libavdevice_winrt.vcxproj index b878a92c9a667..b30c1b070dedf 100644 --- a/SMP/libavdevice_winrt.vcxproj +++ b/SMP/libavdevice_winrt.vcxproj @@ -11,10 +11,11 @@ _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libsdl2d_winrt.lib;libcdio_paranoiad_winrt.lib;%(AdditionalDependencies) @@ -55,17 +56,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libsdl2d_winrt.lib;libcdio_paranoiad_winrt.lib;%(AdditionalDependencies) @@ -106,17 +108,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avformatd_winrt.lib;avcodecd_winrt.lib;avutild_winrt.lib;avfilterd_winrt.lib;sdl2d_winrt.lib;cdio_paranoiad_winrt.lib;%(AdditionalDependencies) @@ -158,17 +161,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avformatd_winrt.lib;avcodecd_winrt.lib;avutild_winrt.lib;avfilterd_winrt.lib;sdl2d_winrt.lib;cdio_paranoiad_winrt.lib;%(AdditionalDependencies) @@ -210,17 +214,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libsdl2_winrt.lib;libcdio_paranoia_winrt.lib;%(AdditionalDependencies) @@ -261,17 +266,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libsdl2_winrt.lib;libcdio_paranoia_winrt.lib;%(AdditionalDependencies) @@ -312,17 +318,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avformat_winrt.lib;avcodec_winrt.lib;avutil_winrt.lib;avfilter_winrt.lib;sdl2_winrt.lib;cdio_paranoia_winrt.lib;%(AdditionalDependencies) @@ -364,17 +371,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avformat_winrt.lib;avcodec_winrt.lib;avutil_winrt.lib;avfilter_winrt.lib;sdl2_winrt.lib;cdio_paranoia_winrt.lib;%(AdditionalDependencies) @@ -416,17 +424,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avformat_winrt.lib;avcodec_winrt.lib;avutil_winrt.lib;avfilter_winrt.lib;libsdl2_winrt.lib;libcdio_paranoia_winrt.lib;%(AdditionalDependencies) @@ -468,17 +477,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avformat_winrt.lib;avcodec_winrt.lib;avutil_winrt.lib;avfilter_winrt.lib;libsdl2_winrt.lib;libcdio_paranoia_winrt.lib;%(AdditionalDependencies) @@ -520,7 +530,7 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\SDL\;$(ProjectDir)\..\..\prebuilt\include\SDL\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) diff --git a/SMP/libavfilter.vcxproj b/SMP/libavfilter.vcxproj index 330dada005f89..a2fb0ff462742 100644 --- a/SMP/libavfilter.vcxproj +++ b/SMP/libavfilter.vcxproj @@ -14,10 +14,11 @@ FRIBIDI_LIB_STATIC;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libassd.lib;libfontconfigd.lib;libfreetyped.lib;libfribidid.lib;libharfbuzzd.lib;libmfxd.lib;%(AdditionalDependencies) @@ -65,17 +66,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) FRIBIDI_LIB_STATIC;_MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) FRIBIDI_LIB_STATIC;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libassd.lib;libfontconfigd.lib;libfreetyped.lib;libfribidid.lib;libharfbuzzd.lib;libmfxd.lib;%(AdditionalDependencies) @@ -123,17 +125,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) FRIBIDI_LIB_STATIC;_MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutild.lib;avformatd.lib;avcodecd.lib;swresampled.lib;postprocd.lib;swscaled.lib;assd.lib;fontconfigd.lib;freetyped.lib;fribidid.lib;harfbuzzd.lib;mfxd.lib;%(AdditionalDependencies) @@ -182,17 +185,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutild.lib;avformatd.lib;avcodecd.lib;swresampled.lib;postprocd.lib;swscaled.lib;assd.lib;fontconfigd.lib;freetyped.lib;fribidid.lib;harfbuzzd.lib;mfxd.lib;%(AdditionalDependencies) @@ -241,17 +245,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) FRIBIDI_LIB_STATIC;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libass.lib;libfontconfig.lib;libfreetype.lib;libfribidi.lib;libharfbuzz.lib;libmfx.lib;%(AdditionalDependencies) @@ -299,17 +304,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) FRIBIDI_LIB_STATIC;_MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) FRIBIDI_LIB_STATIC;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libass.lib;libfontconfig.lib;libfreetype.lib;libfribidi.lib;libharfbuzz.lib;libmfx.lib;%(AdditionalDependencies) @@ -357,17 +363,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) FRIBIDI_LIB_STATIC;_MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil.lib;avformat.lib;avcodec.lib;swresample.lib;postproc.lib;swscale.lib;ass.lib;fontconfig.lib;freetype.lib;fribidi.lib;harfbuzz.lib;mfx.lib;%(AdditionalDependencies) @@ -416,17 +423,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil.lib;avformat.lib;avcodec.lib;swresample.lib;postproc.lib;swscale.lib;ass.lib;fontconfig.lib;freetype.lib;fribidi.lib;harfbuzz.lib;mfx.lib;%(AdditionalDependencies) @@ -475,17 +483,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) FRIBIDI_LIB_STATIC;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil.lib;avformat.lib;avcodec.lib;swresample.lib;postproc.lib;swscale.lib;libass.lib;libfontconfig.lib;libfreetype.lib;libfribidi.lib;libharfbuzz.lib;libmfx.lib;%(AdditionalDependencies) @@ -534,17 +543,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) FRIBIDI_LIB_STATIC;_MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) FRIBIDI_LIB_STATIC;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil.lib;avformat.lib;avcodec.lib;swresample.lib;postproc.lib;swscale.lib;libass.lib;libfontconfig.lib;libfreetype.lib;libfribidi.lib;libharfbuzz.lib;libmfx.lib;%(AdditionalDependencies) @@ -593,7 +603,7 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) FRIBIDI_LIB_STATIC;_MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters index effa6b8f377b0..693674e9a6f18 100644 --- a/SMP/libavfilter.vcxproj.filters +++ b/SMP/libavfilter.vcxproj.filters @@ -19,11 +19,8 @@ {bf017c32-250d-47da-b7e6-d5a5091cb1e6} - - {fd9e10e9-18f6-437d-b5d7-17290540c8b8} - - {f026e68e-ff14-4bf4-8758-6384ac7bcfaf} + {fd9e10e9-18f6-437d-b5d7-17290540c8b8} @@ -76,6 +73,9 @@ Source Files\libavfilter\x86 + + Source Files\libavfilter\x86 + Source Files\libavfilter\x86 @@ -91,9 +91,6 @@ Source Files\libavfilter\x86 - - Source Files\libavfilter\x86 - Source Files\libavfilter\x86 @@ -207,9 +204,6 @@ Source Files\libavfilter - - Source Files\libavfilter - Source Files\libavfilter @@ -726,9 +720,6 @@ Source Files\libavfilter - - Source Files\libavfilter - Source Files\libavfilter @@ -759,15 +750,6 @@ Source Files\libavfilter - - Source Files\libavfilter - - - Source Files\libavfilter - - - Source Files\libavfilter - Source Files\libavfilter @@ -1119,9 +1101,6 @@ Source Files\libavfilter - - Source Files\libavfilter - Source Files\libavfilter @@ -1203,6 +1182,9 @@ Source Files\libavfilter + + Source Files\libavfilter + Source Files\libavfilter @@ -1227,6 +1209,12 @@ Source Files\libavfilter + + Source Files\libavfilter + + + Source Files\libavfilter + Source Files\libavfilter @@ -1278,21 +1266,6 @@ Source Files\libavfilter - - Source Files\libavfilter\dnn - - - Source Files\libavfilter\dnn - - - Source Files\libavfilter\dnn - - - Source Files\libavfilter\dnn - - - Source Files\libavfilter\dnn - Source Files\libavfilter\x86 @@ -1332,6 +1305,9 @@ Source Files\libavfilter\x86 + + Source Files\libavfilter\x86 + Source Files\libavfilter\x86 @@ -1347,9 +1323,6 @@ Source Files\libavfilter\x86 - - Source Files\libavfilter\x86 - Source Files\libavfilter\x86 @@ -1398,6 +1371,9 @@ Source Files\libavfilter\x86 + + Source Files\libavfilter\x86 + Source Files\libavfilter\x86 diff --git a/SMP/libavfilter/filter_list.c b/SMP/libavfilter/filter_list.c index 2918e6cbff6fb..d3cd069fdf261 100644 --- a/SMP/libavfilter/filter_list.c +++ b/SMP/libavfilter/filter_list.c @@ -228,15 +228,11 @@ static const AVFilter *filter_list[] = { #endif &ff_vf_dejudder, &ff_vf_delogo, - &ff_vf_derain, &ff_vf_deshake, &ff_vf_despill, &ff_vf_detelecine, &ff_vf_dilation, &ff_vf_displace, - &ff_vf_dnn_classify, - &ff_vf_dnn_detect, - &ff_vf_dnn_processing, &ff_vf_doubleweave, &ff_vf_drawbox, &ff_vf_drawgraph, @@ -414,7 +410,6 @@ static const AVFilter *filter_list[] = { &ff_vf_sobel, &ff_vf_split, &ff_vf_spp, - &ff_vf_sr, &ff_vf_ssim, &ff_vf_ssim360, &ff_vf_stereo3d, @@ -464,6 +459,7 @@ static const AVFilter *filter_list[] = { &ff_vf_xcorrelate, &ff_vf_xfade, &ff_vf_xmedian, + &ff_vf_xpsnr, &ff_vf_xstack, &ff_vf_yadif, &ff_vf_yaepblur, @@ -494,6 +490,7 @@ static const AVFilter *filter_list[] = { &ff_vsrc_nullsrc, &ff_vsrc_pal75bars, &ff_vsrc_pal100bars, + &ff_vsrc_perlin, &ff_vsrc_rgbtestsrc, &ff_vsrc_sierpinski, &ff_vsrc_smptebars, diff --git a/SMP/libavfilter_files.props b/SMP/libavfilter_files.props index c5fd8e07f06e1..287192146ba9d 100644 --- a/SMP/libavfilter_files.props +++ b/SMP/libavfilter_files.props @@ -25,12 +25,12 @@ + - @@ -70,7 +70,6 @@ - @@ -243,7 +242,6 @@ - @@ -254,9 +252,6 @@ - - - @@ -374,7 +369,6 @@ - @@ -402,6 +396,7 @@ + @@ -410,6 +405,8 @@ + + @@ -427,11 +424,6 @@ - - - - - @@ -445,12 +437,12 @@ + - @@ -467,6 +459,7 @@ + diff --git a/SMP/libavfilter_winrt.vcxproj b/SMP/libavfilter_winrt.vcxproj index aaccdad131c92..72e7f08ac1794 100644 --- a/SMP/libavfilter_winrt.vcxproj +++ b/SMP/libavfilter_winrt.vcxproj @@ -14,10 +14,11 @@ FRIBIDI_LIB_STATIC;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libassd_winrt.lib;libfontconfigd_winrt.lib;libfreetyped_winrt.lib;libfribidid_winrt.lib;libharfbuzzd_winrt.lib;%(AdditionalDependencies) @@ -65,17 +66,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) FRIBIDI_LIB_STATIC;_MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) FRIBIDI_LIB_STATIC;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libassd_winrt.lib;libfontconfigd_winrt.lib;libfreetyped_winrt.lib;libfribidid_winrt.lib;libharfbuzzd_winrt.lib;%(AdditionalDependencies) @@ -123,17 +125,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) FRIBIDI_LIB_STATIC;_MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutild_winrt.lib;avformatd_winrt.lib;avcodecd_winrt.lib;swresampled_winrt.lib;postprocd_winrt.lib;swscaled_winrt.lib;assd_winrt.lib;fontconfigd_winrt.lib;freetyped_winrt.lib;fribidid_winrt.lib;harfbuzzd_winrt.lib;%(AdditionalDependencies) @@ -182,17 +185,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutild_winrt.lib;avformatd_winrt.lib;avcodecd_winrt.lib;swresampled_winrt.lib;postprocd_winrt.lib;swscaled_winrt.lib;assd_winrt.lib;fontconfigd_winrt.lib;freetyped_winrt.lib;fribidid_winrt.lib;harfbuzzd_winrt.lib;%(AdditionalDependencies) @@ -241,17 +245,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) FRIBIDI_LIB_STATIC;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libass_winrt.lib;libfontconfig_winrt.lib;libfreetype_winrt.lib;libfribidi_winrt.lib;libharfbuzz_winrt.lib;%(AdditionalDependencies) @@ -299,17 +304,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) FRIBIDI_LIB_STATIC;_MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) FRIBIDI_LIB_STATIC;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libass_winrt.lib;libfontconfig_winrt.lib;libfreetype_winrt.lib;libfribidi_winrt.lib;libharfbuzz_winrt.lib;%(AdditionalDependencies) @@ -357,17 +363,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) FRIBIDI_LIB_STATIC;_MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil_winrt.lib;avformat_winrt.lib;avcodec_winrt.lib;swresample_winrt.lib;postproc_winrt.lib;swscale_winrt.lib;ass_winrt.lib;fontconfig_winrt.lib;freetype_winrt.lib;fribidi_winrt.lib;harfbuzz_winrt.lib;%(AdditionalDependencies) @@ -416,17 +423,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil_winrt.lib;avformat_winrt.lib;avcodec_winrt.lib;swresample_winrt.lib;postproc_winrt.lib;swscale_winrt.lib;ass_winrt.lib;fontconfig_winrt.lib;freetype_winrt.lib;fribidi_winrt.lib;harfbuzz_winrt.lib;%(AdditionalDependencies) @@ -475,17 +483,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) FRIBIDI_LIB_STATIC;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil_winrt.lib;avformat_winrt.lib;avcodec_winrt.lib;swresample_winrt.lib;postproc_winrt.lib;swscale_winrt.lib;libass_winrt.lib;libfontconfig_winrt.lib;libfreetype_winrt.lib;libfribidi_winrt.lib;libharfbuzz_winrt.lib;%(AdditionalDependencies) @@ -534,17 +543,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) FRIBIDI_LIB_STATIC;_MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) FRIBIDI_LIB_STATIC;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil_winrt.lib;avformat_winrt.lib;avcodec_winrt.lib;swresample_winrt.lib;postproc_winrt.lib;swscale_winrt.lib;libass_winrt.lib;libfontconfig_winrt.lib;libfreetype_winrt.lib;libfribidi_winrt.lib;libharfbuzz_winrt.lib;%(AdditionalDependencies) @@ -593,7 +603,7 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\dnn\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\;$(OutDir)\include\freetype2\;$(ProjectDir)\..\..\prebuilt\include\freetype2\;$(OutDir)\include\fribidi\;$(ProjectDir)\..\..\prebuilt\include\fribidi\;$(OutDir)\include\harfbuzz\;$(ProjectDir)\..\..\prebuilt\include\harfbuzz\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) FRIBIDI_LIB_STATIC;_MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) diff --git a/SMP/libavfilter_winrt.vcxproj.filters b/SMP/libavfilter_winrt.vcxproj.filters index effa6b8f377b0..693674e9a6f18 100644 --- a/SMP/libavfilter_winrt.vcxproj.filters +++ b/SMP/libavfilter_winrt.vcxproj.filters @@ -19,11 +19,8 @@ {bf017c32-250d-47da-b7e6-d5a5091cb1e6} - - {fd9e10e9-18f6-437d-b5d7-17290540c8b8} - - {f026e68e-ff14-4bf4-8758-6384ac7bcfaf} + {fd9e10e9-18f6-437d-b5d7-17290540c8b8} @@ -76,6 +73,9 @@ Source Files\libavfilter\x86 + + Source Files\libavfilter\x86 + Source Files\libavfilter\x86 @@ -91,9 +91,6 @@ Source Files\libavfilter\x86 - - Source Files\libavfilter\x86 - Source Files\libavfilter\x86 @@ -207,9 +204,6 @@ Source Files\libavfilter - - Source Files\libavfilter - Source Files\libavfilter @@ -726,9 +720,6 @@ Source Files\libavfilter - - Source Files\libavfilter - Source Files\libavfilter @@ -759,15 +750,6 @@ Source Files\libavfilter - - Source Files\libavfilter - - - Source Files\libavfilter - - - Source Files\libavfilter - Source Files\libavfilter @@ -1119,9 +1101,6 @@ Source Files\libavfilter - - Source Files\libavfilter - Source Files\libavfilter @@ -1203,6 +1182,9 @@ Source Files\libavfilter + + Source Files\libavfilter + Source Files\libavfilter @@ -1227,6 +1209,12 @@ Source Files\libavfilter + + Source Files\libavfilter + + + Source Files\libavfilter + Source Files\libavfilter @@ -1278,21 +1266,6 @@ Source Files\libavfilter - - Source Files\libavfilter\dnn - - - Source Files\libavfilter\dnn - - - Source Files\libavfilter\dnn - - - Source Files\libavfilter\dnn - - - Source Files\libavfilter\dnn - Source Files\libavfilter\x86 @@ -1332,6 +1305,9 @@ Source Files\libavfilter\x86 + + Source Files\libavfilter\x86 + Source Files\libavfilter\x86 @@ -1347,9 +1323,6 @@ Source Files\libavfilter\x86 - - Source Files\libavfilter\x86 - Source Files\libavfilter\x86 @@ -1398,6 +1371,9 @@ Source Files\libavfilter\x86 + + Source Files\libavfilter\x86 + Source Files\libavfilter\x86 diff --git a/SMP/libavformat.vcxproj b/SMP/libavformat.vcxproj index 3b725aa4e5129..0355ed3d3e09a 100644 --- a/SMP/libavformat.vcxproj +++ b/SMP/libavformat.vcxproj @@ -11,10 +11,11 @@ LIBXML_STATIC;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libbz2d.lib;libiconvd.lib;libzlibd.lib;libgcryptd.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;libsshd.lib;libxml2d.lib;ws2_32.lib;%(AdditionalDependencies) @@ -56,17 +57,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) LIBXML_STATIC;_MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) LIBXML_STATIC;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libbz2d.lib;libiconvd.lib;libzlibd.lib;libgcryptd.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;libsshd.lib;libxml2d.lib;ws2_32.lib;%(AdditionalDependencies) @@ -108,17 +110,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) LIBXML_STATIC;_MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avcodecd.lib;avutild.lib;bz2d.lib;iconvd.lib;zlibd.lib;gcryptd.lib;gnutlsd.lib;blurayd.lib;gmed.lib;modplugd.lib;sshd.lib;xml2d.lib;ws2_32.lib;%(AdditionalDependencies) @@ -161,17 +164,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avcodecd.lib;avutild.lib;bz2d.lib;iconvd.lib;zlibd.lib;gcryptd.lib;gnutlsd.lib;blurayd.lib;gmed.lib;modplugd.lib;sshd.lib;xml2d.lib;ws2_32.lib;%(AdditionalDependencies) @@ -214,17 +218,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) LIBXML_STATIC;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libbz2.lib;libiconv.lib;libzlib.lib;libgcrypt.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libxml2.lib;ws2_32.lib;%(AdditionalDependencies) @@ -266,17 +271,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) LIBXML_STATIC;_MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) LIBXML_STATIC;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libbz2.lib;libiconv.lib;libzlib.lib;libgcrypt.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libxml2.lib;ws2_32.lib;%(AdditionalDependencies) @@ -318,17 +324,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) LIBXML_STATIC;_MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avcodec.lib;avutil.lib;bz2.lib;iconv.lib;zlib.lib;gcrypt.lib;gnutls.lib;bluray.lib;gme.lib;modplug.lib;ssh.lib;xml2.lib;ws2_32.lib;%(AdditionalDependencies) @@ -371,17 +378,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avcodec.lib;avutil.lib;bz2.lib;iconv.lib;zlib.lib;gcrypt.lib;gnutls.lib;bluray.lib;gme.lib;modplug.lib;ssh.lib;xml2.lib;ws2_32.lib;%(AdditionalDependencies) @@ -424,17 +432,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) LIBXML_STATIC;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avcodec.lib;avutil.lib;libbz2.lib;libiconv.lib;libzlib.lib;libgcrypt.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libxml2.lib;ws2_32.lib;%(AdditionalDependencies) @@ -477,17 +486,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) LIBXML_STATIC;_MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) LIBXML_STATIC;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avcodec.lib;avutil.lib;libbz2.lib;libiconv.lib;libzlib.lib;libgcrypt.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libxml2.lib;ws2_32.lib;%(AdditionalDependencies) @@ -530,7 +540,7 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) LIBXML_STATIC;_MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) diff --git a/SMP/libavformat.vcxproj.filters b/SMP/libavformat.vcxproj.filters index 38796d0af7f85..fc2458cd5d2e9 100644 --- a/SMP/libavformat.vcxproj.filters +++ b/SMP/libavformat.vcxproj.filters @@ -109,16 +109,22 @@ Source Files\libavformat - + Source Files\libavformat - + + Source Files\libavformat + + Source Files\libavformat - + Source Files\libavformat - + + Source Files\libavformat + + Source Files\libavformat @@ -628,18 +634,6 @@ Source Files\libavformat - - Source Files\libavformat - - - Source Files\libavformat - - - Source Files\libavformat - - - Source Files\libavformat - Source Files\libavformat @@ -730,12 +724,6 @@ Source Files\libavformat - - Source Files\libavformat - - - Source Files\libavformat - Source Files\libavformat @@ -832,6 +820,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat @@ -874,9 +865,6 @@ Source Files\libavformat - - Source Files\libavformat - Source Files\libavformat @@ -1117,6 +1105,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat @@ -1642,11 +1633,6 @@ Source Files\libavformat - - - Source Files\libavformat - - Source Files\libavformat diff --git a/SMP/libavformat/demuxer_list.c b/SMP/libavformat/demuxer_list.c index 2ff50e9603534..946bbae1fc7eb 100644 --- a/SMP/libavformat/demuxer_list.c +++ b/SMP/libavformat/demuxer_list.c @@ -138,7 +138,6 @@ static const FFInputFormat *demuxer_list[] = { &ff_hevc_demuxer, &ff_hls_demuxer, &ff_hnm_demuxer, - &ff_iamf_demuxer, &ff_ico_demuxer, &ff_idcin_demuxer, &ff_idf_demuxer, @@ -164,6 +163,7 @@ static const FFInputFormat *demuxer_list[] = { &ff_kux_demuxer, &ff_kvag_demuxer, &ff_laf_demuxer, + &ff_lc3_demuxer, &ff_lmlm4_demuxer, &ff_loas_demuxer, &ff_luodat_demuxer, @@ -247,6 +247,7 @@ static const FFInputFormat *demuxer_list[] = { &ff_qoa_demuxer, &ff_r3d_demuxer, &ff_rawvideo_demuxer, + &ff_rcwt_demuxer, &ff_realtext_demuxer, &ff_redspark_demuxer, &ff_rka_demuxer, diff --git a/SMP/libavformat/muxer_list.c b/SMP/libavformat/muxer_list.c index 8b6912af2b0f2..edc8cfb9b2a02 100644 --- a/SMP/libavformat/muxer_list.c +++ b/SMP/libavformat/muxer_list.c @@ -87,7 +87,6 @@ static const FFOutputFormat *muxer_list[] = { &ff_hds_muxer, &ff_hevc_muxer, &ff_hls_muxer, - &ff_iamf_muxer, &ff_ico_muxer, &ff_ilbc_muxer, &ff_image2_muxer, @@ -99,6 +98,7 @@ static const FFOutputFormat *muxer_list[] = { &ff_jacosub_muxer, &ff_kvag_muxer, &ff_latm_muxer, + &ff_lc3_muxer, &ff_lrc_muxer, &ff_m4v_muxer, &ff_md5_muxer, diff --git a/SMP/libavformat_files.props b/SMP/libavformat_files.props index e9b0e0b286692..0dd51923bf413 100644 --- a/SMP/libavformat_files.props +++ b/SMP/libavformat_files.props @@ -38,10 +38,12 @@ - - - - + + + + + + @@ -211,10 +213,6 @@ - - - - @@ -245,8 +243,6 @@ - - @@ -279,6 +275,7 @@ + @@ -293,7 +290,6 @@ - @@ -374,6 +370,7 @@ + @@ -556,14 +553,6 @@ true - - - true - true - true - true - - true diff --git a/SMP/libavformat_winrt.vcxproj b/SMP/libavformat_winrt.vcxproj index 237695cd848c2..44fb102977f5a 100644 --- a/SMP/libavformat_winrt.vcxproj +++ b/SMP/libavformat_winrt.vcxproj @@ -11,10 +11,11 @@ LIBXML_STATIC;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libbz2d_winrt.lib;libiconvd_winrt.lib;libzlibd_winrt.lib;libgcryptd_winrt.lib;libgnutlsd_winrt.lib;libblurayd_winrt.lib;libgmed_winrt.lib;libmodplugd_winrt.lib;libsshd_winrt.lib;libxml2d_winrt.lib;%(AdditionalDependencies) @@ -56,17 +57,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) LIBXML_STATIC;_MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) LIBXML_STATIC;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libbz2d_winrt.lib;libiconvd_winrt.lib;libzlibd_winrt.lib;libgcryptd_winrt.lib;libgnutlsd_winrt.lib;libblurayd_winrt.lib;libgmed_winrt.lib;libmodplugd_winrt.lib;libsshd_winrt.lib;libxml2d_winrt.lib;%(AdditionalDependencies) @@ -108,17 +110,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) LIBXML_STATIC;_MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avcodecd_winrt.lib;avutild_winrt.lib;bz2d_winrt.lib;iconvd_winrt.lib;zlibd_winrt.lib;gcryptd_winrt.lib;gnutlsd_winrt.lib;blurayd_winrt.lib;gmed_winrt.lib;modplugd_winrt.lib;sshd_winrt.lib;xml2d_winrt.lib;%(AdditionalDependencies) @@ -161,17 +164,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avcodecd_winrt.lib;avutild_winrt.lib;bz2d_winrt.lib;iconvd_winrt.lib;zlibd_winrt.lib;gcryptd_winrt.lib;gnutlsd_winrt.lib;blurayd_winrt.lib;gmed_winrt.lib;modplugd_winrt.lib;sshd_winrt.lib;xml2d_winrt.lib;%(AdditionalDependencies) @@ -214,17 +218,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) LIBXML_STATIC;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libbz2_winrt.lib;libiconv_winrt.lib;libzlib_winrt.lib;libgcrypt_winrt.lib;libgnutls_winrt.lib;libbluray_winrt.lib;libgme_winrt.lib;libmodplug_winrt.lib;libssh_winrt.lib;libxml2_winrt.lib;%(AdditionalDependencies) @@ -266,17 +271,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) LIBXML_STATIC;_MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) LIBXML_STATIC;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libbz2_winrt.lib;libiconv_winrt.lib;libzlib_winrt.lib;libgcrypt_winrt.lib;libgnutls_winrt.lib;libbluray_winrt.lib;libgme_winrt.lib;libmodplug_winrt.lib;libssh_winrt.lib;libxml2_winrt.lib;%(AdditionalDependencies) @@ -318,17 +324,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) LIBXML_STATIC;_MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avcodec_winrt.lib;avutil_winrt.lib;bz2_winrt.lib;iconv_winrt.lib;zlib_winrt.lib;gcrypt_winrt.lib;gnutls_winrt.lib;bluray_winrt.lib;gme_winrt.lib;modplug_winrt.lib;ssh_winrt.lib;xml2_winrt.lib;%(AdditionalDependencies) @@ -371,17 +378,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avcodec_winrt.lib;avutil_winrt.lib;bz2_winrt.lib;iconv_winrt.lib;zlib_winrt.lib;gcrypt_winrt.lib;gnutls_winrt.lib;bluray_winrt.lib;gme_winrt.lib;modplug_winrt.lib;ssh_winrt.lib;xml2_winrt.lib;%(AdditionalDependencies) @@ -424,17 +432,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) LIBXML_STATIC;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avcodec_winrt.lib;avutil_winrt.lib;libbz2_winrt.lib;libiconv_winrt.lib;libzlib_winrt.lib;libgcrypt_winrt.lib;libgnutls_winrt.lib;libbluray_winrt.lib;libgme_winrt.lib;libmodplug_winrt.lib;libssh_winrt.lib;libxml2_winrt.lib;%(AdditionalDependencies) @@ -477,17 +486,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) LIBXML_STATIC;_MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) LIBXML_STATIC;_UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avcodec_winrt.lib;avutil_winrt.lib;libbz2_winrt.lib;libiconv_winrt.lib;libzlib_winrt.lib;libgcrypt_winrt.lib;libgnutls_winrt.lib;libbluray_winrt.lib;libgme_winrt.lib;libmodplug_winrt.lib;libssh_winrt.lib;libxml2_winrt.lib;%(AdditionalDependencies) @@ -530,7 +540,7 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\libxml2\;$(ProjectDir)\..\..\prebuilt\include\libxml2\;.\;..\;%(AdditionalIncludeDirectories) LIBXML_STATIC;_MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) diff --git a/SMP/libavformat_winrt.vcxproj.filters b/SMP/libavformat_winrt.vcxproj.filters index 38796d0af7f85..fc2458cd5d2e9 100644 --- a/SMP/libavformat_winrt.vcxproj.filters +++ b/SMP/libavformat_winrt.vcxproj.filters @@ -109,16 +109,22 @@ Source Files\libavformat - + Source Files\libavformat - + + Source Files\libavformat + + Source Files\libavformat - + Source Files\libavformat - + + Source Files\libavformat + + Source Files\libavformat @@ -628,18 +634,6 @@ Source Files\libavformat - - Source Files\libavformat - - - Source Files\libavformat - - - Source Files\libavformat - - - Source Files\libavformat - Source Files\libavformat @@ -730,12 +724,6 @@ Source Files\libavformat - - Source Files\libavformat - - - Source Files\libavformat - Source Files\libavformat @@ -832,6 +820,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat @@ -874,9 +865,6 @@ Source Files\libavformat - - Source Files\libavformat - Source Files\libavformat @@ -1117,6 +1105,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat @@ -1642,11 +1633,6 @@ Source Files\libavformat - - - Source Files\libavformat - - Source Files\libavformat diff --git a/SMP/libavutil.def b/SMP/libavutil.def index b59cd071847e6..369a138668105 100644 --- a/SMP/libavutil.def +++ b/SMP/libavutil.def @@ -78,6 +78,7 @@ EXPORTS av_channel_description av_channel_description_bprint av_channel_from_string + av_channel_layout_ambisonic_order av_channel_layout_channel_from_index av_channel_layout_channel_from_string av_channel_layout_check @@ -150,6 +151,7 @@ EXPORTS av_div_i av_div_q av_dovi_alloc + av_dovi_find_level av_dovi_metadata_alloc av_downmix_info_update_side_data av_dynamic_hdr_plus_alloc @@ -225,11 +227,14 @@ EXPORTS av_frame_ref av_frame_remove_side_data av_frame_replace + av_frame_side_data_add av_frame_side_data_clone + av_frame_side_data_desc av_frame_side_data_free av_frame_side_data_get_c av_frame_side_data_name av_frame_side_data_new + av_frame_side_data_remove av_frame_unref av_free av_freep @@ -346,6 +351,7 @@ EXPORTS av_malloc_array av_mallocz av_mastering_display_metadata_alloc + av_mastering_display_metadata_alloc_size av_mastering_display_metadata_create_side_data av_match_list av_match_name @@ -375,12 +381,15 @@ EXPORTS av_opt_eval_int av_opt_eval_int64 av_opt_eval_q + av_opt_eval_uint av_opt_find av_opt_find2 av_opt_flag_is_set av_opt_free av_opt_freep_ranges av_opt_get + av_opt_get_array + av_opt_get_array_size av_opt_get_chlayout av_opt_get_dict_val av_opt_get_double @@ -399,6 +408,7 @@ EXPORTS av_opt_query_ranges_default av_opt_serialize av_opt_set + av_opt_set_array av_opt_set_bin av_opt_set_chlayout av_opt_set_defaults @@ -475,9 +485,14 @@ EXPORTS av_spherical_tile_bounds av_sscanf av_stereo3d_alloc + av_stereo3d_alloc_size av_stereo3d_create_side_data av_stereo3d_from_name + av_stereo3d_primary_eye_from_name + av_stereo3d_primary_eye_name av_stereo3d_type_name + av_stereo3d_view_from_name + av_stereo3d_view_name av_strcasecmp av_strdup av_strerror diff --git a/SMP/libavutil.vcxproj b/SMP/libavutil.vcxproj index 05892ef285af4..a4fc5a5e0f252 100644 --- a/SMP/libavutil.vcxproj +++ b/SMP/libavutil.vcxproj @@ -14,10 +14,11 @@ _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libgcryptd.lib;libmfxd.lib;Bcrypt.lib;%(AdditionalDependencies) @@ -156,17 +157,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libgcryptd.lib;libmfxd.lib;Bcrypt.lib;%(AdditionalDependencies) @@ -305,17 +307,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 gcryptd.lib;mfxd.lib;Bcrypt.lib;%(AdditionalDependencies) @@ -455,17 +458,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 gcryptd.lib;mfxd.lib;Bcrypt.lib;%(AdditionalDependencies) @@ -605,17 +609,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libgcrypt.lib;libmfx.lib;Bcrypt.lib;%(AdditionalDependencies) @@ -754,17 +759,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libgcrypt.lib;libmfx.lib;Bcrypt.lib;%(AdditionalDependencies) @@ -903,17 +909,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 gcrypt.lib;mfx.lib;Bcrypt.lib;%(AdditionalDependencies) @@ -1053,17 +1060,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 gcrypt.lib;mfx.lib;Bcrypt.lib;%(AdditionalDependencies) @@ -1203,17 +1211,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libgcrypt.lib;libmfx.lib;Bcrypt.lib;%(AdditionalDependencies) @@ -1353,17 +1362,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libgcrypt.lib;libmfx.lib;Bcrypt.lib;%(AdditionalDependencies) @@ -1503,7 +1513,7 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) diff --git a/SMP/libavutil/ffversion.h b/SMP/libavutil/ffversion.h index 1e08f2bf7d9c5..c2d20520d595d 100644 --- a/SMP/libavutil/ffversion.h +++ b/SMP/libavutil/ffversion.h @@ -21,5 +21,5 @@ #ifndef SMP_LIBAVUTIL_FFVERSION_H #define SMP_LIBAVUTIL_FFVERSION_H -#define FFMPEG_VERSION "7.0.2" +#define FFMPEG_VERSION "7.1" #endif /* SMP_LIBAVUTIL_FFVERSION_H */ diff --git a/SMP/libavutil_winrt.vcxproj b/SMP/libavutil_winrt.vcxproj index a79f62cc0fcce..f636d8c1fe8da 100644 --- a/SMP/libavutil_winrt.vcxproj +++ b/SMP/libavutil_winrt.vcxproj @@ -14,10 +14,11 @@ _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libgcryptd_winrt.lib;dxgi.lib;d3d11.lib;d3d12.lib;Bcrypt.lib;%(AdditionalDependencies) @@ -156,17 +157,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libgcryptd_winrt.lib;dxgi.lib;d3d11.lib;d3d12.lib;Bcrypt.lib;%(AdditionalDependencies) @@ -305,17 +307,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 gcryptd_winrt.lib;dxgi.lib;d3d11.lib;d3d12.lib;Bcrypt.lib;%(AdditionalDependencies) @@ -455,17 +458,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 gcryptd_winrt.lib;dxgi.lib;d3d11.lib;d3d12.lib;Bcrypt.lib;%(AdditionalDependencies) @@ -605,17 +609,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libgcrypt_winrt.lib;dxgi.lib;d3d11.lib;d3d12.lib;Bcrypt.lib;%(AdditionalDependencies) @@ -754,17 +759,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libgcrypt_winrt.lib;dxgi.lib;d3d11.lib;d3d12.lib;Bcrypt.lib;%(AdditionalDependencies) @@ -903,17 +909,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 gcrypt_winrt.lib;dxgi.lib;d3d11.lib;d3d12.lib;Bcrypt.lib;%(AdditionalDependencies) @@ -1053,17 +1060,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 gcrypt_winrt.lib;dxgi.lib;d3d11.lib;d3d12.lib;Bcrypt.lib;%(AdditionalDependencies) @@ -1203,17 +1211,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libgcrypt_winrt.lib;dxgi.lib;d3d11.lib;d3d12.lib;Bcrypt.lib;%(AdditionalDependencies) @@ -1353,17 +1362,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libgcrypt_winrt.lib;dxgi.lib;d3d11.lib;d3d12.lib;Bcrypt.lib;%(AdditionalDependencies) @@ -1503,7 +1513,7 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;$(OutDir)\include\mfx\;$(ProjectDir)\..\..\prebuilt\include\mfx\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) diff --git a/SMP/libpostproc.vcxproj b/SMP/libpostproc.vcxproj index a75f59bc663fc..09567ee51ed84 100644 --- a/SMP/libpostproc.vcxproj +++ b/SMP/libpostproc.vcxproj @@ -11,10 +11,11 @@ _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 %(AdditionalDependencies) @@ -55,17 +56,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 %(AdditionalDependencies) @@ -106,17 +108,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutild.lib;%(AdditionalDependencies) @@ -158,17 +161,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutild.lib;%(AdditionalDependencies) @@ -210,17 +214,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 %(AdditionalDependencies) @@ -261,17 +266,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 %(AdditionalDependencies) @@ -312,17 +318,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil.lib;%(AdditionalDependencies) @@ -364,17 +371,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil.lib;%(AdditionalDependencies) @@ -416,17 +424,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil.lib;%(AdditionalDependencies) @@ -468,17 +477,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil.lib;%(AdditionalDependencies) @@ -520,7 +530,7 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) diff --git a/SMP/libpostproc_winrt.vcxproj b/SMP/libpostproc_winrt.vcxproj index 81be9a89de8db..5aeabe741562b 100644 --- a/SMP/libpostproc_winrt.vcxproj +++ b/SMP/libpostproc_winrt.vcxproj @@ -11,10 +11,11 @@ _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 %(AdditionalDependencies) @@ -55,17 +56,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 %(AdditionalDependencies) @@ -106,17 +108,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutild_winrt.lib;%(AdditionalDependencies) @@ -158,17 +161,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutild_winrt.lib;%(AdditionalDependencies) @@ -210,17 +214,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 %(AdditionalDependencies) @@ -261,17 +266,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 %(AdditionalDependencies) @@ -312,17 +318,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil_winrt.lib;%(AdditionalDependencies) @@ -364,17 +371,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil_winrt.lib;%(AdditionalDependencies) @@ -416,17 +424,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil_winrt.lib;%(AdditionalDependencies) @@ -468,17 +477,18 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil_winrt.lib;%(AdditionalDependencies) @@ -520,7 +530,7 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) diff --git a/SMP/libswresample.vcxproj b/SMP/libswresample.vcxproj index f2b053640a79e..fae485ecdd1e8 100644 --- a/SMP/libswresample.vcxproj +++ b/SMP/libswresample.vcxproj @@ -14,10 +14,11 @@ _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libsoxrd.lib;%(AdditionalDependencies) @@ -63,17 +64,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libsoxrd.lib;%(AdditionalDependencies) @@ -119,17 +121,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutild.lib;soxrd.lib;%(AdditionalDependencies) @@ -176,17 +179,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutild.lib;soxrd.lib;%(AdditionalDependencies) @@ -233,17 +237,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libsoxr.lib;%(AdditionalDependencies) @@ -289,17 +294,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libsoxr.lib;%(AdditionalDependencies) @@ -345,17 +351,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil.lib;soxr.lib;%(AdditionalDependencies) @@ -402,17 +409,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil.lib;soxr.lib;%(AdditionalDependencies) @@ -459,17 +467,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil.lib;libsoxr.lib;%(AdditionalDependencies) @@ -516,17 +525,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil.lib;libsoxr.lib;%(AdditionalDependencies) @@ -573,7 +583,7 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) diff --git a/SMP/libswresample_winrt.vcxproj b/SMP/libswresample_winrt.vcxproj index 65b60cf93c487..5171148c47239 100644 --- a/SMP/libswresample_winrt.vcxproj +++ b/SMP/libswresample_winrt.vcxproj @@ -14,10 +14,11 @@ _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libsoxrd_winrt.lib;%(AdditionalDependencies) @@ -63,17 +64,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libsoxrd_winrt.lib;%(AdditionalDependencies) @@ -119,17 +121,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutild_winrt.lib;soxrd_winrt.lib;%(AdditionalDependencies) @@ -176,17 +179,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutild_winrt.lib;soxrd_winrt.lib;%(AdditionalDependencies) @@ -233,17 +237,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libsoxr_winrt.lib;%(AdditionalDependencies) @@ -289,17 +294,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 libsoxr_winrt.lib;%(AdditionalDependencies) @@ -345,17 +351,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil_winrt.lib;soxr_winrt.lib;%(AdditionalDependencies) @@ -402,17 +409,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil_winrt.lib;soxr_winrt.lib;%(AdditionalDependencies) @@ -459,17 +467,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil_winrt.lib;libsoxr_winrt.lib;%(AdditionalDependencies) @@ -516,17 +525,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil_winrt.lib;libsoxr_winrt.lib;%(AdditionalDependencies) @@ -573,7 +583,7 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) diff --git a/SMP/libswscale.def b/SMP/libswscale.def index bfbe3f64c5e89..6441b5252d973 100644 --- a/SMP/libswscale.def +++ b/SMP/libswscale.def @@ -1,7 +1,6 @@ EXPORTS sws_allocVec sws_alloc_context - sws_alloc_set_opts sws_convertPalette8ToPacked24 sws_convertPalette8ToPacked32 sws_frame_end diff --git a/SMP/libswscale.vcxproj b/SMP/libswscale.vcxproj index a434272824b60..75fceb3d52fa1 100644 --- a/SMP/libswscale.vcxproj +++ b/SMP/libswscale.vcxproj @@ -14,10 +14,11 @@ _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 %(AdditionalDependencies) @@ -63,17 +64,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 %(AdditionalDependencies) @@ -119,17 +121,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutild.lib;%(AdditionalDependencies) @@ -176,17 +179,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutild.lib;%(AdditionalDependencies) @@ -233,17 +237,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 %(AdditionalDependencies) @@ -289,17 +294,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 %(AdditionalDependencies) @@ -345,17 +351,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil.lib;%(AdditionalDependencies) @@ -402,17 +409,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil.lib;%(AdditionalDependencies) @@ -459,17 +467,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil.lib;%(AdditionalDependencies) @@ -516,17 +525,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil.lib;%(AdditionalDependencies) @@ -573,7 +583,7 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) diff --git a/SMP/libswscale.vcxproj.filters b/SMP/libswscale.vcxproj.filters index 9e58fe90a065f..79c56dd1c9523 100644 --- a/SMP/libswscale.vcxproj.filters +++ b/SMP/libswscale.vcxproj.filters @@ -46,6 +46,9 @@ Source Files\libswscale\x86 + + Source Files\libswscale\x86 + Source Files\libswscale\x86 @@ -102,9 +105,6 @@ Source Files\libswscale\x86 - - Source Files\libswscale - Source Files\libswscale diff --git a/SMP/libswscale_files.props b/SMP/libswscale_files.props index 90212f0b04779..033e673fd25f5 100644 --- a/SMP/libswscale_files.props +++ b/SMP/libswscale_files.props @@ -16,6 +16,7 @@ + @@ -36,7 +37,6 @@ - $(IntDir)\libswscale_input.obj diff --git a/SMP/libswscale_winrt.vcxproj b/SMP/libswscale_winrt.vcxproj index ca7764980fb9a..61603876d4ac4 100644 --- a/SMP/libswscale_winrt.vcxproj +++ b/SMP/libswscale_winrt.vcxproj @@ -14,10 +14,11 @@ _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 %(AdditionalDependencies) @@ -63,17 +64,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 %(AdditionalDependencies) @@ -119,17 +121,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutild_winrt.lib;%(AdditionalDependencies) @@ -176,17 +179,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutild_winrt.lib;%(AdditionalDependencies) @@ -233,17 +237,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 %(AdditionalDependencies) @@ -289,17 +294,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 %(AdditionalDependencies) @@ -345,17 +351,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil_winrt.lib;%(AdditionalDependencies) @@ -402,17 +409,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil_winrt.lib;%(AdditionalDependencies) @@ -459,17 +467,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil_winrt.lib;%(AdditionalDependencies) @@ -516,17 +525,18 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) _UCRT_NOISY_NAN;restrict=__restrict;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) + stdc11 avutil_winrt.lib;%(AdditionalDependencies) @@ -573,7 +583,7 @@ cd $(ProjectDir) false - $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\compat\stdbit\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) diff --git a/SMP/libswscale_winrt.vcxproj.filters b/SMP/libswscale_winrt.vcxproj.filters index 9e58fe90a065f..79c56dd1c9523 100644 --- a/SMP/libswscale_winrt.vcxproj.filters +++ b/SMP/libswscale_winrt.vcxproj.filters @@ -46,6 +46,9 @@ Source Files\libswscale\x86 + + Source Files\libswscale\x86 + Source Files\libswscale\x86 @@ -102,9 +105,6 @@ Source Files\libswscale\x86 - - Source Files\libswscale - Source Files\libswscale