project: Update for recent upstream merge.

92a90c42 · Matt Oliver · b1d428ff · 92a90c42 · 92a90c42 · 92a90c42
15 changed file
--- a/SMP/appveyor.yml
+++ b/SMP/appveyor.yml
@@ -109,12 +109,12 @@ before_build:
        $env:VCTargetsPath="$env:MSBUILDDIR\..\..\..\Microsoft.Cpp\v4.0\V${env:MSVC_VER}0"
    }

-# Download and install yasm integration
- ps: (New-Object Net.WebClient).DownloadFile('https://github.com/ShiftMediaProject/VSYASM/releases/download/0.1/VSYASM.zip', "$pwd\yasm.zip")
- ps: Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory("$pwd\yasm.zip", "$pwd\TempYASMUnpack")
- cmd: call ".\TempYASMUnpack\install_script.bat"
-# Additional yasm location in order to fix gitlink error
- ps: if ($env:MSVC_VER -ne 15) { Copy-Item -Force "TempYASMUnpack\*.*" "$env:VCTargetsPath\..\BuildCustomizations" }
+# Download and install nasm integration
+- ps: (New-Object Net.WebClient).DownloadFile('https://github.com/ShiftMediaProject/VSNASM/releases/download/0.3/VSNASM.zip', "$pwd\nasm.zip")
+- ps: Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory("$pwd\nasm.zip", "$pwd\TempNASMUnpack")
+- cmd: call ".\TempNASMUnpack\install_script.bat"
+# Additional nasm location in order to fix gitlink error
+- ps: if ($env:MSVC_VER -ne 15) { Copy-Item -Force "TempNASMUnpack\*.*" "$env:VCTargetsPath\..\BuildCustomizations" }

 # Use project supplied script to download all required dependency libraries
 - cmd: call "%APPVEYOR_BUILD_FOLDER%\SMP\project_get_dependencies.bat"
@@ -133,7 +133,7 @@ after_build:
 # Copy licenses for dependencies
 - cmd: copy /y %APPVEYOR_BUILD_FOLDER%\..\prebuilt\licenses\*.* %APPVEYOR_BUILD_FOLDER%\build_out\licenses\

-# Copy binary files to seperate artifact folder
+# Copy binary files to separate artifact folder
 - cmd: mkdir %APPVEYOR_BUILD_FOLDER%\build_bin\x86 >NUL 2>&1
 - cmd: copy /y %APPVEYOR_BUILD_FOLDER%\build_out\bin\x86\*.exe %APPVEYOR_BUILD_FOLDER%\build_bin\x86
 - cmd: mkdir %APPVEYOR_BUILD_FOLDER%\build_bin\x64 >NUL 2>&1

--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -41,19 +41,15 @@
 %define ARCH_TILEPRO 0
 %define ARCH_TOMI 0
 %define ARCH_X86 1
-%ifidn __OUTPUT_FORMAT__,x64
+%if __BITS__ = 64
 %define ARCH_X86_32 0
-%elifidn __OUTPUT_FORMAT__,win64
-%define ARCH_X86_32 0
-%elifidn __OUTPUT_FORMAT__,win32
+%elif __BITS__ = 32
 %define ARCH_X86_32 1
 %define PREFIX
 %endif
-%ifidn __OUTPUT_FORMAT__,x64
-%define ARCH_X86_64 1
-%elifidn __OUTPUT_FORMAT__,win64
+%if __BITS__ = 64
 %define ARCH_X86_64 1
-%elifidn __OUTPUT_FORMAT__,win32
+%elif __BITS__ = 32
 %define ARCH_X86_64 0
 %endif
 %define HAVE_ARMV5TE 0
@@ -75,6 +71,7 @@
 %define HAVE_AMD3DNOWEXT 1
 %define HAVE_AVX 1
 %define HAVE_AVX2 1
+%define HAVE_AVX512 1
 %define HAVE_FMA3 1
 %define HAVE_FMA4 1
 %define HAVE_MMX 1
@@ -86,7 +83,7 @@
 %define HAVE_SSE42 1
 %define HAVE_SSSE3 1
 %define HAVE_XOP 1
-%define HAVE_CPUNOP 1
+%define HAVE_CPUNOP 0
 %define HAVE_I686 1
 %define HAVE_MIPSFPU 0
 %define HAVE_MIPS32R2 0
@@ -119,6 +116,7 @@
 %define HAVE_AMD3DNOWEXT_EXTERNAL 1
 %define HAVE_AVX_EXTERNAL 1
 %define HAVE_AVX2_EXTERNAL 1
+%define HAVE_AVX512_EXTERNAL 1
 %define HAVE_FMA3_EXTERNAL 1
 %define HAVE_FMA4_EXTERNAL 1
 %define HAVE_MMX_EXTERNAL 1
@@ -130,7 +128,7 @@
 %define HAVE_SSE42_EXTERNAL 1
 %define HAVE_SSSE3_EXTERNAL 1
 %define HAVE_XOP_EXTERNAL 1
-%define HAVE_CPUNOP_EXTERNAL 1
+%define HAVE_CPUNOP_EXTERNAL 0
 %define HAVE_I686_EXTERNAL 1
 %define HAVE_MIPSFPU_EXTERNAL 0
 %define HAVE_MIPS32R2_EXTERNAL 0
@@ -163,6 +161,7 @@
 %define HAVE_AMD3DNOWEXT_INLINE 1
 %define HAVE_AVX_INLINE 1
 %define HAVE_AVX2_INLINE 1
+%define HAVE_AVX512_INLINE 1
 %define HAVE_FMA3_INLINE 1
 %define HAVE_FMA4_INLINE 1
 %define HAVE_MMX_INLINE 1
@@ -188,18 +187,14 @@
 %define HAVE_LOONGSON2_INLINE 0
 %define HAVE_LOONGSON3_INLINE 0
 %define HAVE_MMI_INLINE 0
-%ifidn __OUTPUT_FORMAT__,x64
+%if __BITS__ = 64
 %define HAVE_ALIGNED_STACK 1
-%elifidn __OUTPUT_FORMAT__,win64
-%define HAVE_ALIGNED_STACK 1
-%elifidn __OUTPUT_FORMAT__,win32
+%elif __BITS__ = 32
 %define HAVE_ALIGNED_STACK 0
 %endif
-%ifidn __OUTPUT_FORMAT__,x64
-%define HAVE_FAST_64BIT 1
-%elifidn __OUTPUT_FORMAT__,win64
+%if __BITS__ = 64
 %define HAVE_FAST_64BIT 1
-%elifidn __OUTPUT_FORMAT__,win32
+%elif __BITS__ = 32
 %define HAVE_FAST_64BIT 0
 %endif
 %define HAVE_FAST_CLZ 1
@@ -207,6 +202,7 @@
 %define HAVE_LOCAL_ALIGNED 1
 %define HAVE_SIMD_ALIGN_16 1
 %define HAVE_SIMD_ALIGN_32 1
+%define HAVE_SIMD_ALIGN_64 1
 %define HAVE_ATOMICS_GCC 0
 %define HAVE_ATOMICS_SUNCC 0
 %define HAVE_ATOMICS_WIN32 1
@@ -377,7 +373,6 @@
 %define HAVE_VFP_ARGS 0
 %define HAVE_XFORM_ASM 0
 %define HAVE_XMM_CLOBBERS 1
-%define HAVE_CONDITION_VARIABLE_PTR 1
 %define HAVE_KCMVIDEOCODECTYPE_HEVC 0
 %define HAVE_SOCKLEN_T 1
 %define HAVE_STRUCT_ADDRINFO 1
@@ -1672,6 +1667,7 @@
 %define CONFIG_DCTDNOIZ_FILTER 1
 %define CONFIG_DEBAND_FILTER 1
 %define CONFIG_DECIMATE_FILTER 1
+%define CONFIG_DECONVOLVE_FILTER 1
 %define CONFIG_DEFLATE_FILTER 1
 %define CONFIG_DEFLICKER_FILTER 1
 %define CONFIG_DEINTERLACE_QSV_FILTER 1

--- a/SMP/config.h
+++ b/SMP/config.h
@@ -101,6 +101,7 @@
 #define HAVE_AMD3DNOWEXT 1
 #define HAVE_AVX 1
 #define HAVE_AVX2 1
+#define HAVE_AVX512 1
 #define HAVE_FMA3 1
 #define HAVE_FMA4 1
 #define HAVE_MMX 1
@@ -112,7 +113,7 @@
 #define HAVE_SSE42 1
 #define HAVE_SSSE3 1
 #define HAVE_XOP 1
-#define HAVE_CPUNOP 1
+#define HAVE_CPUNOP 0
 #define HAVE_I686 1
 #define HAVE_MIPSFPU 0
 #define HAVE_MIPS32R2 0
@@ -145,6 +146,7 @@
 #define HAVE_AMD3DNOWEXT_EXTERNAL 1
 #define HAVE_AVX_EXTERNAL 1
 #define HAVE_AVX2_EXTERNAL 1
+#define HAVE_AVX512_EXTERNAL 1
 #define HAVE_FMA3_EXTERNAL 1
 #define HAVE_FMA4_EXTERNAL 1
 #define HAVE_MMX_EXTERNAL 1
@@ -156,7 +158,7 @@
 #define HAVE_SSE42_EXTERNAL 1
 #define HAVE_SSSE3_EXTERNAL 1
 #define HAVE_XOP_EXTERNAL 1
-#define HAVE_CPUNOP_EXTERNAL 1
+#define HAVE_CPUNOP_EXTERNAL 0
 #define HAVE_I686_EXTERNAL 1
 #define HAVE_MIPSFPU_EXTERNAL 0
 #define HAVE_MIPS32R2_EXTERNAL 0
@@ -189,6 +191,7 @@
 #define HAVE_AMD3DNOWEXT_INLINE ARCH_X86 && HAVE_INLINE_ASM
 #define HAVE_AVX_INLINE ARCH_X86 && HAVE_INLINE_ASM
 #define HAVE_AVX2_INLINE ARCH_X86 && HAVE_INLINE_ASM
+#define HAVE_AVX512_INLINE ARCH_X86 && HAVE_INLINE_ASM
 #define HAVE_FMA3_INLINE ARCH_X86 && HAVE_INLINE_ASM
 #define HAVE_FMA4_INLINE ARCH_X86 && HAVE_INLINE_ASM
 #define HAVE_MMX_INLINE ARCH_X86 && HAVE_INLINE_ASM
@@ -229,6 +232,7 @@
 #define HAVE_LOCAL_ALIGNED 1
 #define HAVE_SIMD_ALIGN_16 1
 #define HAVE_SIMD_ALIGN_32 1
+#define HAVE_SIMD_ALIGN_64 1
 #define HAVE_ATOMICS_GCC 0
 #define HAVE_ATOMICS_SUNCC 0
 #define HAVE_ATOMICS_WIN32 1
@@ -415,7 +419,6 @@
 #define HAVE_VFP_ARGS 0
 #define HAVE_XFORM_ASM 0
 #define HAVE_XMM_CLOBBERS 1
-#define HAVE_CONDITION_VARIABLE_PTR 1
 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0
 #define HAVE_SOCKLEN_T 1
 #define HAVE_STRUCT_ADDRINFO 1
@@ -1750,6 +1753,7 @@
 #define CONFIG_DCTDNOIZ_FILTER 1
 #define CONFIG_DEBAND_FILTER 1
 #define CONFIG_DECIMATE_FILTER 1
+#define CONFIG_DECONVOLVE_FILTER 1
 #define CONFIG_DEFLATE_FILTER 1
 #define CONFIG_DEFLICKER_FILTER 1
 #define CONFIG_DEINTERLACE_QSV_FILTER 1

--- a/SMP/libavcodec.def
+++ b/SMP/libavcodec.def
@@ -204,14 +204,12 @@ EXPORTS
    avpriv_get_raw_pix_fmt_tags
    avpriv_h264_has_num_reorder_frames
    avpriv_init_elbg
-    avpriv_lock_avformat
    avpriv_mpeg4audio_get_config
    avpriv_mpegaudio_decode_header
    avpriv_put_string
    avpriv_split_xiph_headers
    avpriv_tak_parse_streaminfo
    avpriv_toupper4
-    avpriv_unlock_avformat
    avsubtitle_free
    av_codec_ffversion DATA
    avpriv_ac3_channel_layout_tab DATA

--- a/SMP/libavcodec.vcxproj
+++ b/SMP/libavcodec.vcxproj
--- a/SMP/libavcodec.vcxproj.filters
+++ b/SMP/libavcodec.vcxproj.filters
@@ -34,276 +34,276 @@
    </ResourceCompile>
  </ItemGroup>
  <ItemGroup>
-    <YASM Include="..\libavcodec\x86\ac3dsp.asm">
+    <NASM Include="..\libavcodec\x86\ac3dsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\ac3dsp_downmix.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\ac3dsp_downmix.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\audiodsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\audiodsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\blockdsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\blockdsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\bswapdsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\bswapdsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\dct32.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\dct32.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\fft.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\fft.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\fmtconvert.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\fmtconvert.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\h263_loopfilter.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\h263_loopfilter.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\h264_chromamc.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\h264_chromamc.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\h264_chromamc_10bit.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\h264_chromamc_10bit.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\h264_deblock.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\h264_deblock.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\h264_deblock_10bit.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\h264_deblock_10bit.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\h264_idct.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\h264_idct.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\h264_idct_10bit.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\h264_idct_10bit.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\h264_weight.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\h264_weight.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\h264_weight_10bit.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\h264_weight_10bit.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\h264_intrapred.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\h264_intrapred.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\h264_intrapred_10bit.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\h264_intrapred_10bit.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\h264_qpel_8bit.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\h264_qpel_8bit.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\h264_qpel_10bit.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\h264_qpel_10bit.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\fpel.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\fpel.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\qpel.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\qpel.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\hpeldsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\hpeldsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\huffyuvdsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\huffyuvdsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\huffyuvencdsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\huffyuvencdsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\idctdsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\idctdsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\lossless_audiodsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\lossless_audiodsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\lossless_videodsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\lossless_videodsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\lossless_videoencdsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\lossless_videoencdsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\mdct15.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\mdct15.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\me_cmp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\me_cmp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\imdct36.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\imdct36.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\mpegvideoencdsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\mpegvideoencdsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\opus_pvq_search.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\opus_pvq_search.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\pixblockdsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\pixblockdsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\qpeldsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\qpeldsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\rv34dsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\rv34dsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\vc1dsp_loopfilter.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\vc1dsp_loopfilter.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\vc1dsp_mc.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\vc1dsp_mc.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\simple_idct10.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\simple_idct10.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\simple_idct.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\simple_idct.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\videodsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\videodsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\vp3dsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\vp3dsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\vp8dsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\vp8dsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\vp8dsp_loopfilter.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\vp8dsp_loopfilter.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\aacpsdsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\aacpsdsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\sbrdsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\sbrdsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\aacencdsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\aacencdsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\g722dsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\g722dsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\alacdsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\alacdsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\pngdsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\pngdsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\cavsidct.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\cavsidct.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\dcadsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\dcadsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\synth_filter.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\synth_filter.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\diracdsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\diracdsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\dirac_dwt.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\dirac_dwt.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\dnxhdenc.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\dnxhdenc.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\exrdsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\exrdsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\flacdsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\flacdsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\flac_dsp_gpl.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\flac_dsp_gpl.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\hevc_add_res.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\hevc_add_res.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\hevc_deblock.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\hevc_deblock.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\hevc_idct.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\hevc_idct.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\hevc_mc.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\hevc_mc.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\hevc_sao.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\hevc_sao.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\hevc_sao_10bit.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\hevc_sao_10bit.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\jpeg2000dsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\jpeg2000dsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\mlpdsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\mlpdsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\xvididct.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\xvididct.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\proresdsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\proresdsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\rv40dsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\rv40dsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\svq1enc.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\svq1enc.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\takdsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\takdsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\ttadsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\ttadsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\ttaencdsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\ttaencdsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\utvideodsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\utvideodsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\v210enc.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\v210enc.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\v210.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\v210.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\vorbisdsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\vorbisdsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\hpeldsp_vp3.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\hpeldsp_vp3.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\vp6dsp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\vp6dsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\vp9intrapred.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\vp9intrapred.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\vp9intrapred_16bpp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\vp9intrapred_16bpp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\vp9itxfm.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\vp9itxfm.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\vp9itxfm_16bpp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\vp9itxfm_16bpp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\vp9lpf.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\vp9lpf.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\vp9lpf_16bpp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\vp9lpf_16bpp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\vp9mc.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\vp9mc.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\vp9mc_16bpp.asm">
+    </NASM>
+    <NASM Include="..\libavcodec\x86\vp9mc_16bpp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
+    </NASM>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\libavcodec\ac3_parser.c">

--- a/SMP/libavfilter.vcxproj
+++ b/SMP/libavfilter.vcxproj
@@ -69,31 +69,31 @@
    </ResourceCompile>
  </ItemGroup>
  <ItemGroup>
-    <YASM Include="..\libavfilter\x86\af_afir.asm" />
-    <YASM Include="..\libavfilter\x86\vf_blend.asm" />
-    <YASM Include="..\libavfilter\x86\vf_bwdif.asm" />
-    <YASM Include="..\libavfilter\x86\colorspacedsp.asm" />
-    <YASM Include="..\libavfilter\x86\vf_fspp.asm" />
-    <YASM Include="..\libavfilter\x86\vf_gradfun.asm" />
-    <YASM Include="..\libavfilter\x86\vf_hflip.asm" />
-    <YASM Include="..\libavfilter\x86\vf_hqdn3d.asm" />
-    <YASM Include="..\libavfilter\x86\vf_idet.asm" />
-    <YASM Include="..\libavfilter\x86\vf_interlace.asm" />
-    <YASM Include="..\libavfilter\x86\vf_limiter.asm" />
-    <YASM Include="..\libavfilter\x86\vf_maskedmerge.asm" />
-    <YASM Include="..\libavfilter\x86\vf_pp7.asm" />
-    <YASM Include="..\libavfilter\x86\vf_psnr.asm" />
-    <YASM Include="..\libavfilter\x86\vf_pullup.asm" />
-    <YASM Include="..\libavfilter\x86\vf_removegrain.asm" />
-    <YASM Include="..\libavfilter\x86\avf_showcqt.asm" />
-    <YASM Include="..\libavfilter\x86\vf_ssim.asm" />
-    <YASM Include="..\libavfilter\x86\vf_stereo3d.asm" />
-    <YASM Include="..\libavfilter\x86\vf_threshold.asm" />
-    <YASM Include="..\libavfilter\x86\af_volume.asm" />
-    <YASM Include="..\libavfilter\x86\vf_w3fdif.asm" />
-    <YASM Include="..\libavfilter\x86\vf_yadif.asm" />
-    <YASM Include="..\libavfilter\x86\yadif-16.asm" />
-    <YASM Include="..\libavfilter\x86\yadif-10.asm" />
+    <NASM Include="..\libavfilter\x86\af_afir.asm" />
+    <NASM Include="..\libavfilter\x86\vf_blend.asm" />
+    <NASM Include="..\libavfilter\x86\vf_bwdif.asm" />
+    <NASM Include="..\libavfilter\x86\colorspacedsp.asm" />
+    <NASM Include="..\libavfilter\x86\vf_fspp.asm" />
+    <NASM Include="..\libavfilter\x86\vf_gradfun.asm" />
+    <NASM Include="..\libavfilter\x86\vf_hflip.asm" />
+    <NASM Include="..\libavfilter\x86\vf_hqdn3d.asm" />
+    <NASM Include="..\libavfilter\x86\vf_idet.asm" />
+    <NASM Include="..\libavfilter\x86\vf_interlace.asm" />
+    <NASM Include="..\libavfilter\x86\vf_limiter.asm" />
+    <NASM Include="..\libavfilter\x86\vf_maskedmerge.asm" />
+    <NASM Include="..\libavfilter\x86\vf_pp7.asm" />
+    <NASM Include="..\libavfilter\x86\vf_psnr.asm" />
+    <NASM Include="..\libavfilter\x86\vf_pullup.asm" />
+    <NASM Include="..\libavfilter\x86\vf_removegrain.asm" />
+    <NASM Include="..\libavfilter\x86\avf_showcqt.asm" />
+    <NASM Include="..\libavfilter\x86\vf_ssim.asm" />
+    <NASM Include="..\libavfilter\x86\vf_stereo3d.asm" />
+    <NASM Include="..\libavfilter\x86\vf_threshold.asm" />
+    <NASM Include="..\libavfilter\x86\af_volume.asm" />
+    <NASM Include="..\libavfilter\x86\vf_w3fdif.asm" />
+    <NASM Include="..\libavfilter\x86\vf_yadif.asm" />
+    <NASM Include="..\libavfilter\x86\yadif-16.asm" />
+    <NASM Include="..\libavfilter\x86\yadif-10.asm" />
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\libavfilter\allfilters.c" />
@@ -595,7 +595,7 @@
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\yasm.props" />
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\nasm.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -769,11 +769,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -837,11 +837,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -912,11 +912,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -985,11 +985,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1060,11 +1060,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1133,11 +1133,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1207,11 +1207,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1279,11 +1279,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1359,11 +1359,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1438,11 +1438,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1518,11 +1518,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1597,11 +1597,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1669,11 +1669,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1741,11 +1741,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1753,6 +1753,6 @@ cd $(ProjectDir)
  </ItemDefinitionGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\yasm.targets" />
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\nasm.targets" />
  </ImportGroup>
 </Project>
\ No newline at end of file
--- a/SMP/libavfilter.vcxproj.filters
+++ b/SMP/libavfilter.vcxproj.filters
@@ -34,81 +34,81 @@
    </ResourceCompile>
  </ItemGroup>
  <ItemGroup>
-    <YASM Include="..\libavfilter\x86\af_afir.asm">
+    <NASM Include="..\libavfilter\x86\af_afir.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavfilter\x86\vf_blend.asm">
+    </NASM>
+    <NASM Include="..\libavfilter\x86\vf_blend.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavfilter\x86\vf_bwdif.asm">
+    </NASM>
+    <NASM Include="..\libavfilter\x86\vf_bwdif.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavfilter\x86\colorspacedsp.asm">
+    </NASM>
+    <NASM Include="..\libavfilter\x86\colorspacedsp.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavfilter\x86\vf_fspp.asm">
+    </NASM>
+    <NASM Include="..\libavfilter\x86\vf_fspp.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavfilter\x86\vf_gradfun.asm">
+    </NASM>
+    <NASM Include="..\libavfilter\x86\vf_gradfun.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavfilter\x86\vf_hflip.asm">
+    </NASM>
+    <NASM Include="..\libavfilter\x86\vf_hflip.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavfilter\x86\vf_hqdn3d.asm">
+    </NASM>
+    <NASM Include="..\libavfilter\x86\vf_hqdn3d.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavfilter\x86\vf_idet.asm">
+    </NASM>
+    <NASM Include="..\libavfilter\x86\vf_idet.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavfilter\x86\vf_interlace.asm">
+    </NASM>
+    <NASM Include="..\libavfilter\x86\vf_interlace.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavfilter\x86\vf_limiter.asm">
+    </NASM>
+    <NASM Include="..\libavfilter\x86\vf_limiter.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavfilter\x86\vf_maskedmerge.asm">
+    </NASM>
+    <NASM Include="..\libavfilter\x86\vf_maskedmerge.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavfilter\x86\vf_pp7.asm">
+    </NASM>
+    <NASM Include="..\libavfilter\x86\vf_pp7.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavfilter\x86\vf_psnr.asm">
+    </NASM>
+    <NASM Include="..\libavfilter\x86\vf_psnr.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavfilter\x86\vf_pullup.asm">
+    </NASM>
+    <NASM Include="..\libavfilter\x86\vf_pullup.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavfilter\x86\vf_removegrain.asm">
+    </NASM>
+    <NASM Include="..\libavfilter\x86\vf_removegrain.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavfilter\x86\avf_showcqt.asm">
+    </NASM>
+    <NASM Include="..\libavfilter\x86\avf_showcqt.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavfilter\x86\vf_ssim.asm">
+    </NASM>
+    <NASM Include="..\libavfilter\x86\vf_ssim.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavfilter\x86\vf_stereo3d.asm">
+    </NASM>
+    <NASM Include="..\libavfilter\x86\vf_stereo3d.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavfilter\x86\vf_threshold.asm">
+    </NASM>
+    <NASM Include="..\libavfilter\x86\vf_threshold.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavfilter\x86\af_volume.asm">
+    </NASM>
+    <NASM Include="..\libavfilter\x86\af_volume.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavfilter\x86\vf_w3fdif.asm">
+    </NASM>
+    <NASM Include="..\libavfilter\x86\vf_w3fdif.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavfilter\x86\vf_yadif.asm">
+    </NASM>
+    <NASM Include="..\libavfilter\x86\vf_yadif.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavfilter\x86\yadif-16.asm">
+    </NASM>
+    <NASM Include="..\libavfilter\x86\yadif-16.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavfilter\x86\yadif-10.asm">
+    </NASM>
+    <NASM Include="..\libavfilter\x86\yadif-10.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
-    </YASM>
+    </NASM>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\libavfilter\allfilters.c">

--- a/SMP/libavutil.vcxproj
+++ b/SMP/libavutil.vcxproj
@@ -69,13 +69,13 @@
    </ResourceCompile>
  </ItemGroup>
  <ItemGroup>
-    <YASM Include="..\libavutil\x86\cpuid.asm" />
-    <YASM Include="..\libavutil\x86\emms.asm" />
-    <YASM Include="..\libavutil\x86\fixed_dsp.asm" />
-    <YASM Include="..\libavutil\x86\float_dsp.asm" />
-    <YASM Include="..\libavutil\x86\imgutils.asm" />
-    <YASM Include="..\libavutil\x86\lls.asm" />
-    <YASM Include="..\libavutil\x86\pixelutils.asm" />
+    <NASM Include="..\libavutil\x86\cpuid.asm" />
+    <NASM Include="..\libavutil\x86\emms.asm" />
+    <NASM Include="..\libavutil\x86\fixed_dsp.asm" />
+    <NASM Include="..\libavutil\x86\float_dsp.asm" />
+    <NASM Include="..\libavutil\x86\imgutils.asm" />
+    <NASM Include="..\libavutil\x86\lls.asm" />
+    <NASM Include="..\libavutil\x86\pixelutils.asm" />
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\libavutil\adler32.c" />
@@ -374,7 +374,7 @@
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\yasm.props" />
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\nasm.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -623,11 +623,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -766,11 +766,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -916,11 +916,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1064,11 +1064,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1214,11 +1214,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1362,11 +1362,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1511,11 +1511,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1658,11 +1658,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1813,11 +1813,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1967,11 +1967,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -2122,11 +2122,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -2276,11 +2276,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -2423,11 +2423,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -2570,11 +2570,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -2582,6 +2582,6 @@ cd $(ProjectDir)
  </ItemDefinitionGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\yasm.targets" />
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\nasm.targets" />
  </ImportGroup>
 </Project>
\ No newline at end of file
--- a/SMP/libavutil.vcxproj.filters
+++ b/SMP/libavutil.vcxproj.filters
@@ -40,27 +40,27 @@
    </ResourceCompile>
  </ItemGroup>
  <ItemGroup>
-    <YASM Include="..\libavutil\x86\cpuid.asm">
+    <NASM Include="..\libavutil\x86\cpuid.asm">
      <Filter>Source Files\libavutil\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavutil\x86\emms.asm">
+    </NASM>
+    <NASM Include="..\libavutil\x86\emms.asm">
      <Filter>Source Files\libavutil\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavutil\x86\fixed_dsp.asm">
+    </NASM>
+    <NASM Include="..\libavutil\x86\fixed_dsp.asm">
      <Filter>Source Files\libavutil\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavutil\x86\float_dsp.asm">
+    </NASM>
+    <NASM Include="..\libavutil\x86\float_dsp.asm">
      <Filter>Source Files\libavutil\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavutil\x86\imgutils.asm">
+    </NASM>
+    <NASM Include="..\libavutil\x86\imgutils.asm">
      <Filter>Source Files\libavutil\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavutil\x86\lls.asm">
+    </NASM>
+    <NASM Include="..\libavutil\x86\lls.asm">
      <Filter>Source Files\libavutil\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavutil\x86\pixelutils.asm">
+    </NASM>
+    <NASM Include="..\libavutil\x86\pixelutils.asm">
      <Filter>Source Files\libavutil\x86</Filter>
-    </YASM>
+    </NASM>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\libavutil\adler32.c">

--- a/SMP/libswresample.vcxproj
+++ b/SMP/libswresample.vcxproj
@@ -69,9 +69,9 @@
    </ResourceCompile>
  </ItemGroup>
  <ItemGroup>
-    <YASM Include="..\libswresample\x86\audio_convert.asm" />
-    <YASM Include="..\libswresample\x86\rematrix.asm" />
-    <YASM Include="..\libswresample\x86\resample.asm" />
+    <NASM Include="..\libswresample\x86\audio_convert.asm" />
+    <NASM Include="..\libswresample\x86\rematrix.asm" />
+    <NASM Include="..\libswresample\x86\resample.asm" />
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\libswresample\audioconvert.c" />
@@ -218,7 +218,7 @@
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\yasm.props" />
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\nasm.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -390,11 +390,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -456,11 +456,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -529,11 +529,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -600,11 +600,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -673,11 +673,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -744,11 +744,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -816,11 +816,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -886,11 +886,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -964,11 +964,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1041,11 +1041,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1119,11 +1119,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1196,11 +1196,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1266,11 +1266,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1336,11 +1336,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1348,6 +1348,6 @@ cd $(ProjectDir)
  </ItemDefinitionGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\yasm.targets" />
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\nasm.targets" />
  </ImportGroup>
 </Project>
\ No newline at end of file
--- a/SMP/libswresample.vcxproj.filters
+++ b/SMP/libswresample.vcxproj.filters
@@ -34,15 +34,15 @@
    </ResourceCompile>
  </ItemGroup>
  <ItemGroup>
-    <YASM Include="..\libswresample\x86\audio_convert.asm">
+    <NASM Include="..\libswresample\x86\audio_convert.asm">
      <Filter>Source Files\libswresample\x86</Filter>
-    </YASM>
-    <YASM Include="..\libswresample\x86\rematrix.asm">
+    </NASM>
+    <NASM Include="..\libswresample\x86\rematrix.asm">
      <Filter>Source Files\libswresample\x86</Filter>
-    </YASM>
-    <YASM Include="..\libswresample\x86\resample.asm">
+    </NASM>
+    <NASM Include="..\libswresample\x86\resample.asm">
      <Filter>Source Files\libswresample\x86</Filter>
-    </YASM>
+    </NASM>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\libswresample\audioconvert.c">

--- a/SMP/libswscale.vcxproj
+++ b/SMP/libswscale.vcxproj
@@ -69,9 +69,9 @@
    </ResourceCompile>
  </ItemGroup>
  <ItemGroup>
-    <YASM Include="..\libswscale\x86\input.asm" />
-    <YASM Include="..\libswscale\x86\output.asm" />
-    <YASM Include="..\libswscale\x86\scale.asm" />
+    <NASM Include="..\libswscale\x86\input.asm" />
+    <NASM Include="..\libswscale\x86\output.asm" />
+    <NASM Include="..\libswscale\x86\scale.asm" />
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\libswscale\alphablend.c" />
@@ -230,7 +230,7 @@
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\yasm.props" />
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\nasm.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -402,11 +402,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -468,11 +468,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -541,11 +541,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -612,11 +612,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -685,11 +685,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -756,11 +756,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -828,11 +828,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -898,11 +898,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -976,11 +976,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1053,11 +1053,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1131,11 +1131,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1208,11 +1208,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1278,11 +1278,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1348,11 +1348,11 @@ cd ../
 cd $(ProjectDir)
 )</Command>
    </PreBuildEvent>
-    <YASM>
-      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;%(IncludePaths)</IncludePaths>
+    <NASM>
+      <IncludePaths>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths)</IncludePaths>
      <PreIncludeFiles>config.asm;%(PreIncludeFiles)</PreIncludeFiles>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </YASM>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </NASM>
    <ResourceCompile>
      <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_MSC_VER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1360,6 +1360,6 @@ cd $(ProjectDir)
  </ItemDefinitionGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\yasm.targets" />
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\nasm.targets" />
  </ImportGroup>
 </Project>
\ No newline at end of file
--- a/SMP/libswscale.vcxproj.filters
+++ b/SMP/libswscale.vcxproj.filters
@@ -34,15 +34,15 @@
    </ResourceCompile>
  </ItemGroup>
  <ItemGroup>
-    <YASM Include="..\libswscale\x86\input.asm">
+    <NASM Include="..\libswscale\x86\input.asm">
      <Filter>Source Files\libswscale\x86</Filter>
-    </YASM>
-    <YASM Include="..\libswscale\x86\output.asm">
+    </NASM>
+    <NASM Include="..\libswscale\x86\output.asm">
      <Filter>Source Files\libswscale\x86</Filter>
-    </YASM>
-    <YASM Include="..\libswscale\x86\scale.asm">
+    </NASM>
+    <NASM Include="..\libswscale\x86\scale.asm">
      <Filter>Source Files\libswscale\x86</Filter>
-    </YASM>
+    </NASM>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\libswscale\alphablend.c">

--- a/SMP/readme.txt
+++ b/SMP/readme.txt
@@ -75,11 +75,11 @@ other sources may result in version mismatch or other issues. Although these ext
 with them are not covered by ShiftMediaProject and so they should be used with discretion.
 	

-*** Building with YASM ***
+*** Building with NASM ***

-In order to build FFmpeg using msvc you must first download and install YASM.
-YASM is required to compile all assembly files.
+In order to build FFmpeg using msvc you must first download and install NASM.
+NASM is required to compile all assembly files.

-1) Visual Studio YASM integration can be downloaded from https://github.com/ShiftMediaProject/VSYASM/releases/latest
+1) Visual Studio YASM integration can be downloaded from https://github.com/ShiftMediaProject/VSNASM/releases/latest

 2) Once downloaded simply follow the install instructions included in the download.