diff --git a/installer/generate_binaries.bat b/installer/generate_binaries.bat index bf0abae3..a4cc7e30 100644 --- a/installer/generate_binaries.bat +++ b/installer/generate_binaries.bat @@ -49,7 +49,7 @@ copy ..\graphicscapture\graphicscapturehook\release\graphicscapturehook.dll .\32 copy ..\graphicscapture\graphicscapturehook\x64\release\graphicscapturehook64.dll .\32bit\plugins\graphicscapture copy ..\injectHelper\release\injectHelper.exe .\32bit\plugins\graphicscapture copy ..\injectHelper\x64\release\injectHelper64.exe .\32bit\plugins\graphicscapture -copy ..\x264\libs\32bit\libx264-144.dll .\32bit +copy ..\x264\libs\32bit\libx264-146.dll .\32bit copy ..\QSVHelper\Release\QSVHelper.exe .\32bit copy ..\ObsNvenc\Release\ObsNvenc.dll .\32bit copy "%WindowsSDK80Path%Debuggers\x86\dbghelp.dll" .\32bit @@ -74,7 +74,7 @@ copy ..\graphicscapture\graphicscapturehook\release\graphicscapturehook.dll .\64 copy ..\graphicscapture\graphicscapturehook\x64\release\graphicscapturehook64.dll .\64bit\plugins\graphicscapture copy ..\injectHelper\release\injectHelper.exe .\64bit\plugins\graphicscapture copy ..\injectHelper\x64\release\injectHelper64.exe .\64bit\plugins\graphicscapture -copy ..\x264\libs\64bit\libx264-144.dll .\64bit +copy ..\x264\libs\64bit\libx264-146.dll .\64bit copy ..\QSVHelper\Release\QSVHelper.exe .\64bit copy ..\ObsNvenc\x64\Release\ObsNvenc.dll .\64bit copy "%WindowsSDK80Path%Debuggers\x64\dbghelp.dll" .\64bit @@ -155,7 +155,7 @@ copy 64bit\plugins\scenesw\locale\*.txt .\upload\scenesw\64bit\scenesw\locale\ copy 32bit\obs.exe .\upload\OBS\32bit\ copy 32bit\obsapi.dll .\upload\OBS\32bit\ copy 32bit\*.pdb .\upload\OBS\32bit\ -copy 32bit\libx264-144.dll .\upload\OBS\32bit +copy 32bit\libx264-146.dll .\upload\OBS\32bit copy 32bit\QSVHelper.exe .\upload\OBS\32bit copy 32bit\ObsNvenc.dll .\upload\OBS\32bit copy "%WindowsSDK80Path%Debuggers\x86\dbghelp.dll" .\upload\OBS\32bit @@ -163,7 +163,7 @@ copy "%WindowsSDK80Path%Debuggers\x86\dbghelp.dll" .\upload\OBS\32bit copy 64bit\obs.exe .\upload\OBS\64bit\ copy 64bit\obsapi.dll .\upload\OBS\64bit\ copy 64bit\*.pdb .\upload\OBS\64bit\ -copy 64bit\libx264-144.dll .\upload\OBS\64bit +copy 64bit\libx264-146.dll .\upload\OBS\64bit copy 64bit\QSVHelper.exe .\upload\OBS\64bit copy 64bit\ObsNvenc.dll .\upload\OBS\64bit copy "%WindowsSDK80Path%Debuggers\x64\dbghelp.dll" .\upload\OBS\64bit diff --git a/installer/installer.nsi b/installer/installer.nsi index bf566d4b..4d7173f7 100644 --- a/installer/installer.nsi +++ b/installer/installer.nsi @@ -137,7 +137,7 @@ Section "Open Broadcaster Software" Section1 SetOutPath "$PROGRAMFILES32\OBS" File "/oname=LICENSE" "..\COPYING" File "32bit\OBS.exe" - File "32bit\libx264-144.dll" + File "32bit\libx264-146.dll" File "32bit\QSVHelper.exe" File "32bit\OBSApi.dll" File "32bit\services.xconfig" @@ -178,7 +178,7 @@ Section "Open Broadcaster Software" Section1 SetOutPath "$PROGRAMFILES64\OBS" File "/oname=LICENSE" "..\COPYING" File "64bit\OBS.exe" - File "64bit\libx264-144.dll" + File "64bit\libx264-146.dll" File "64bit\QSVHelper.exe" File "64bit\OBSApi.dll" File "64bit\services.xconfig" @@ -272,7 +272,7 @@ Section "un.OBS Program Files" ; Clean up Open Broadcaster Software Delete "$PROGRAMFILES32\OBS\OBS.exe" Delete "$PROGRAMFILES32\LICENSE" - Delete "$PROGRAMFILES32\OBS\libx264-144.dll" + Delete "$PROGRAMFILES32\OBS\libx264-146.dll" Delete "$PROGRAMFILES32\OBS\QSVHelper.exe" Delete "$PROGRAMFILES32\OBS\OBSApi.dll" Delete "$PROGRAMFILES32\OBS\services.xconfig" @@ -295,7 +295,7 @@ Section "un.OBS Program Files" ${if} ${RunningX64} Delete "$PROGRAMFILES64\OBS\OBS.exe" Delete "$PROGRAMFILES64\LICENSE" - Delete "$PROGRAMFILES64\OBS\libx264-144.dll" + Delete "$PROGRAMFILES64\OBS\libx264-146.dll" Delete "$PROGRAMFILES64\OBS\QSVHelper.exe" Delete "$PROGRAMFILES64\OBS\OBSApi.dll" Delete "$PROGRAMFILES64\OBS\services.xconfig" diff --git a/x264/libs/32bit/libx264-144.dll b/x264/libs/32bit/libx264-146.dll similarity index 69% rename from x264/libs/32bit/libx264-144.dll rename to x264/libs/32bit/libx264-146.dll index 5e715a27..9c26a047 100644 Binary files a/x264/libs/32bit/libx264-144.dll and b/x264/libs/32bit/libx264-146.dll differ diff --git a/x264/libs/32bit/libx264.lib b/x264/libs/32bit/libx264.lib index 4fe12659..bac7dc9b 100644 Binary files a/x264/libs/32bit/libx264.lib and b/x264/libs/32bit/libx264.lib differ diff --git a/x264/libs/64bit/libx264-144.dll b/x264/libs/64bit/libx264-146.dll similarity index 71% rename from x264/libs/64bit/libx264-144.dll rename to x264/libs/64bit/libx264-146.dll index d7c83c83..91575146 100644 Binary files a/x264/libs/64bit/libx264-144.dll and b/x264/libs/64bit/libx264-146.dll differ diff --git a/x264/libs/64bit/libx264.lib b/x264/libs/64bit/libx264.lib index f67f6953..46bb2a65 100644 Binary files a/x264/libs/64bit/libx264.lib and b/x264/libs/64bit/libx264.lib differ diff --git a/x264/x264.h b/x264/x264.h index c3e462a4..7cc5fccf 100644 --- a/x264/x264.h +++ b/x264/x264.h @@ -1,7 +1,7 @@ /***************************************************************************** * x264.h: x264 public header ***************************************************************************** - * Copyright (C) 2003-2014 x264 project + * Copyright (C) 2003-2015 x264 project * * Authors: Laurent Aimar * Loren Merritt @@ -41,7 +41,7 @@ #include "x264_config.h" -#define X264_BUILD 144 +#define X264_BUILD 146 /* Application developers planning to link against a shared library version of * libx264 from a Microsoft Visual Studio or similar development environment diff --git a/x264/x264_config.h b/x264/x264_config.h index 6ca7d18f..fa6aea20 100644 --- a/x264/x264_config.h +++ b/x264/x264_config.h @@ -2,7 +2,7 @@ #define X264_GPL 1 #define X264_INTERLACED 0 #define X264_CHROMA_FORMAT 0 -#define X264_REV 2525 +#define X264_REV 2538 #define X264_REV_DIFF 0 -#define X264_VERSION " r2525 40bb568" -#define X264_POINTVER "0.144.2525 40bb568" +#define X264_VERSION " r2538 121396c" +#define X264_POINTVER "0.146.2538 121396c"