Merge branch 'release-1.7.10'

.gitignore

@@ -21,10 +21,11 @@
 /contrib/MPC-HC.tar
 /contrib/MPC-HC.tgz
 /distrib/*.exe
-/include/version_rev.h
+/build/version_rev.h
 /signinfo.txt
 /src/filters/transform/VSFilter/installer/*.exe
 /src/mpc-hc/mpcresources/backup
+/src/mpc-hc/mpcresources/*.rc
 /src/mpc-hc/mpcresources/tx.exe
 /src/mpc-hc/res/mpc-hc.exe.manifest
 /src/MPCTestAPI/bin

.gitmodules

@@ -1,9 +1,28 @@
+[submodule "LAVFilters"]
+    path = src/thirdparty/LAVFilters/src
+    url = https://github.com/mpc-hc/LAVFilters.git
 [submodule "lcms2"]
     path = src/thirdparty/lcms2/library
     url = https://github.com/mm2/Little-CMS.git
+[submodule "MediaInfoLib"]
+    path = src/thirdparty/MediaInfo/library
+    url = https://github.com/MediaArea/MediaInfoLib.git
 [submodule "RARFileSource"]
     path = src/thirdparty/RARFileSource/library
     url = https://github.com/mpc-hc/rarfilesource.git
-[submodule "LAVFilters"]
-    path = src/thirdparty/LAVFilters/src
-    url = https://github.com/mpc-hc/LAVFilters.git
+[submodule "ZenLib"]
+    path = src/thirdparty/ZenLib/library
+    url = https://github.com/MediaArea/ZenLib.git
+[submodule "soxr"]
+    path = src/thirdparty/soxr/libsoxr
+    url = https://github.com/alexmarsev/soxr.git
+[submodule "bs2b"]
+    path = src/thirdparty/bs2b/libbs2b
+    url = https://github.com/alexmarsev/libbs2b.git
+[submodule "soundtouch"]
+    path = src/thirdparty/SoundTouch/soundtouch
+    url = https://github.com/alexmarsev/soundtouch.git
+[submodule "sanear"]
+    path = src/thirdparty/sanear/sanear
+    url = https://github.com/alexmarsev/sanear.git
+    branch = core

Readme.md

@@ -31,12 +31,12 @@ See [CONTRIBUTING.md](/CONTRIBUTING.md) for more info.
 * Multi-Monitor support
 * Various [pixel shaders](https://en.wikipedia.org/wiki/Shader#Pixel_shaders)
 * [Color management](https://en.wikipedia.org/wiki/Color_management)
-* 38 translations available
+* 41 translations available
 
 
 ## System Requirements:
 * An SSE capable CPU
-* Windows XP SP3, Vista, 7, 8, 8.1 32-bit/64-bit
+* Windows XP SP3, Vista, 7, 8, 8.1, 10 32-bit/64-bit
 
 
 ## Links:
@@ -63,8 +63,9 @@ MPC-HC makes use of the following third-party code:
 
 | Project           | License                   | Website           |
 | ----------------- | ------------------------- | ----------------- |
+| bs2b              | MIT License               | http://bs2b.sourceforge.net |
 | CSizingControlBar | -                         | http://www.datamekanix.com/sizecbar/ |
-| LAV Filters       | GPLv2+                    | https://code.google.com/p/lavfilters/ |
+| LAV Filters       | GPLv2+                    | https://github.com/Nevcairiel/LAVFilters |
 | libdivide         | zlib License              | http://libdivide.com/ |
 | Little CMS        | MIT License               | http://www.littlecms.com/ |
 | Logitech SDK      | -                         | - |
@@ -75,10 +76,13 @@ MPC-HC makes use of the following third-party code:
 | RARFileSource     | GPLv2+                    | http://www.v12pwr.com/RARFileSource/ |
 | RealMedia SDK     | -                         | - |
 | ResizableLib      | Artistic License          | https://sourceforge.net/projects/resizablelib/ |
+| sanear            | LGPLv2.1                  | https://github.com/alexmarsev/sanear |
 | Silk Icons        | CC Attribution 2.5        | http://www.famfamfam.com/lab/icons/silk/ |
 | SoundTouch        | LGPLv2.1                  | http://www.surina.net/soundtouch/ |
+| soxr              | LGPLv2.1+                 | https://sourceforge.net/projects/soxr/ |
 | TreePropSheet     | -                         | http://www.codeproject.com/Articles/3709/ |
 | UnRAR             | freeware                  | http://www.rarlab.com/rar_add.htm |
 | VirtualDub        | GPLv2+                    | http://www.virtualdub.org/ |
 | ZenLib            | zlib License              | https://sourceforge.net/projects/zenlib/ |
+| zita-resampler    | GPLv3                     | http://kokkinizita.linuxaudio.org/linuxaudio/ |
 | zlib              | zlib License              | http://zlib.net/ |

build.bat

@@ -222,6 +222,7 @@ IF %ERRORLEVEL% NEQ 0 (
 IF /I "%SIGN%" == "True" CALL :SubSign MPC-HC mpc-hc*.exe
 IF /I "%SIGN%" == "True" CALL :SubSign MPC-HC *.dll %LAVFILTERSDIR%
 IF /I "%SIGN%" == "True" CALL :SubSign MPC-HC *.ax %LAVFILTERSDIR%
+IF /I "%SIGN%" == "True" CALL :SubSign MPC-HC CrashReporterDialog.dll CrashReporter
 
 EXIT /B
 
@@ -272,19 +273,10 @@ EXIT /B
 :SubMPCRresources
 IF %ERRORLEVEL% NEQ 0 EXIT /B
 
-FOR %%G IN (
- "Arabic" "Armenian" "Basque" "Belarusian" "Bengali" "Catalan" "Chinese Simplified"
- "Chinese Traditional" "Croatian" "Czech" "Danish" "Dutch" "English (British)"
- "Finnish" "French" "Galician" "German" "Greek" "Hebrew" "Hungarian" "Italian"
- "Japanese" "Korean" "Malay" "Polish" "Portuguese (Brazil)" "Romanian" "Russian"
- "Serbian" "Slovak" "Slovenian" "Spanish" "Swedish" "Tatar" "Thai" "Turkish"
- "Ukrainian" "Vietnamese"
-) DO (
- TITLE Compiling mpcresources %COMPILER% - %%~G^|%1...
- MSBuild.exe mpcresources.sln %MSBUILD_SWITCHES%^
- /target:%BUILDTYPE% /property:Configuration="Release %%~G";Platform=%1
- IF %ERRORLEVEL% NEQ 0 CALL "%COMMON%" :SubMsg "ERROR" "Compilation failed!" & EXIT /B
-)
+TITLE Compiling mpcresources %COMPILER%...
+MSBuild.exe mpcresources.sln %MSBUILD_SWITCHES%^
+ /target:%BUILDTYPE% /property:Configuration="Release";Platform=%1
+IF %ERRORLEVEL% NEQ 0 CALL "%COMMON%" :SubMsg "ERROR" "Compilation failed!" & EXIT /B
 IF /I "%SIGN%" == "True" CALL :SubSign MPC-HC mpcresources.??.dll Lang
 IF /I "%SIGN%" == "True" CALL :SubSign MPC-HC mpcresources.??_??.dll Lang
 EXIT /B
@@ -452,11 +444,12 @@ IF /I "%NAME%" == "MPC-HC" (
   COPY /Y /V "%VS_OUT_DIR%\d3dx9_43.dll"                  "%PCKG_NAME%\d3dx9_43.dll" >NUL
   IF NOT EXIST "%PCKG_NAME%\Shaders" MD "%PCKG_NAME%\Shaders"
   COPY /Y /V "..\src\mpc-hc\res\shaders\external\*.hlsl" "%PCKG_NAME%\Shaders" >NUL
-  IF /I "%BUILDCFG%" NEQ "Debug" IF /I "%BUILDCFG%" NEQ "Debug Lite" IF EXIST "%VS_OUT_DIR%\CrashReporter" (
+  IF /I "%BUILDCFG%" NEQ "Debug" IF /I "%BUILDCFG%" NEQ "Debug Lite" IF EXIST "%VS_OUT_DIR%\CrashReporter\crashrpt.dll" (
     IF NOT EXIST "%PCKG_NAME%\CrashReporter" MD "%PCKG_NAME%\CrashReporter"
-    COPY /Y /V "%VS_OUT_DIR%\CrashReporter\crashrpt.dll" "%PCKG_NAME%\CrashReporter"
-    COPY /Y /V "%VS_OUT_DIR%\CrashReporter\dbghelp.dll"  "%PCKG_NAME%\CrashReporter"
-    COPY /Y /V "%VS_OUT_DIR%\CrashReporter\sendrpt.exe"  "%PCKG_NAME%\CrashReporter"
+    COPY /Y /V "%VS_OUT_DIR%\CrashReporter\crashrpt.dll"            "%PCKG_NAME%\CrashReporter"
+    COPY /Y /V "%VS_OUT_DIR%\CrashReporter\dbghelp.dll"             "%PCKG_NAME%\CrashReporter"
+    COPY /Y /V "%VS_OUT_DIR%\CrashReporter\sendrpt.exe"             "%PCKG_NAME%\CrashReporter"
+    COPY /Y /V "%VS_OUT_DIR%\CrashReporter\CrashReporterDialog.dll" "%PCKG_NAME%\CrashReporter"
   )
 ) ELSE (
   COPY /Y /V "%VS_OUT_DIR%\*.ax"           "%PCKG_NAME%\*.ax" >NUL

build/About.txt

@@ -0,0 +1 @@
+Generates git-describe and environment info through custom nmake command.

build/BuildConfig.vcxproj

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="About.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="version_rev.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="..\src\mpc-hc\res\mpc-hc.exe.manifest" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{981574AE-5A5E-4F27-BDF1-1B841E374CFF}</ProjectGuid>
+    <ProjectName>BuildConfig</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="..\src\platform.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\src\common.props" />
+  </ImportGroup>
+  <PropertyGroup>
+    <BaseIntermediateOutputPath>$(IntDir)</BaseIntermediateOutputPath>
+    <NMakeBuildCommandLine>..\update_version.bat --quiet</NMakeBuildCommandLine>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

common.bat

@@ -55,7 +55,7 @@ FOR /F "tokens=2,3" %%A IN ('FINDSTR /R /C:"define MPC_VERSION_[M,P]" "include\v
   SET "%%A=%%B"
 )
 
-FOR /F "tokens=2,3" %%A IN ('FINDSTR /R /C:"define MPC" "include\version_rev.h"') DO (
+FOR /F "tokens=2,3" %%A IN ('FINDSTR /R /C:"define MPC" "build\version_rev.h"') DO (
   SET "%%A=%%B"
 )
 

contrib/astyle.ini

@@ -1,4 +1,4 @@
-# (C) 2012-2013 see Authors.txt
+# (C) 2012-2015 see Authors.txt
 #
 # This file is part of MPC-HC.
 #
@@ -45,7 +45,8 @@
 --exclude=avisynth --exclude=dx --exclude=lglcd --exclude=qt
 --exclude=realmedia --exclude=vd2 --exclude=winddk --exclude=libdivide.h
 --exclude=MediaInfoDLL.h --exclude=mvrInterfaces.h --exclude=SubRenderIntf.h
---exclude=unrar.h --exclude=Utf8.h --exclude=version_rev.h
+--exclude=unrar.h --exclude=Utf8.h --exclude=version_rev.h --exclude=ISubRender.h
+--exclude=ISubPic.h
 
 # src/DeCSS
 --exclude=CSSauth.cpp --exclude=CSSauth.h --exclude=CSSscramble.cpp --exclude=CSSscramble.h

contrib/mpc-hc.cppcheck

@@ -15,6 +15,7 @@
     </libraries>
     <suppressions>
         <suppression>cstyleCast</suppression>
+        <suppression>noExplicitConstructor</suppression>
         <suppression>redundantAssignment</suppression>
         <suppression>unreadVariable</suppression>
         <suppression>unusedPrivateFunction</suppression>