diff options
| author | Casimir666 <casimir666@users.sourceforge.net> | 2011-03-02 22:48:46 +0300 |
|---|---|---|
| committer | Casimir666 <casimir666@users.sourceforge.net> | 2011-03-02 22:48:46 +0300 |
| commit | 64495b9ddc3cbd4c1c9acbacebd084ecfb5f2cc5 (patch) | |
| tree | 84963759baebda1bf382d5208243de8b24a8ba03 | |
| parent | 6f7fcf48c71bedd558ee6f51eeff56f834d9443e (diff) | |
Sandy Bridge patchrelease_v1_5_1_2903
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/tags/release_v1_5_1_2903@2960 10f7b99b-c216-0410-bff0-8a66a9350fd8
| -rw-r--r-- | include/Version.h | 2 | ||||
| -rw-r--r-- | src/apps/mplayerc/Changelog.txt | 5 | ||||
| -rw-r--r-- | src/apps/mplayerc/res/mpc-hc.exe.manifest.conf | 2 | ||||
| -rw-r--r-- | src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/include/Version.h b/include/Version.h index 823e4a7b4..b91274169 100644 --- a/include/Version.h +++ b/include/Version.h @@ -24,7 +24,7 @@ #define MPC_VERSION_MAJOR 1
#define MPC_VERSION_MINOR 5
-#define MPC_VERSION_PATCH 0
+#define MPC_VERSION_PATCH 1
#define MPC_COMP_NAME "MPC-HC Team"
#define MPC_COPYRIGHT "Copyright (C) 2002-2011 see AUTHORS file"
diff --git a/src/apps/mplayerc/Changelog.txt b/src/apps/mplayerc/Changelog.txt index 3c4131e7a..900bd74e0 100644 --- a/src/apps/mplayerc/Changelog.txt +++ b/src/apps/mplayerc/Changelog.txt @@ -1,3 +1,8 @@ +v1.5.1.2903 - 29 February 2011
+==============================
+ FIXED : Crash on Sandy Bridge processor
+
+
v1.5.0.2827 - 31 January 2011
==============================
NEW : Added new options to always default to external subtitles, ignore
diff --git a/src/apps/mplayerc/res/mpc-hc.exe.manifest.conf b/src/apps/mplayerc/res/mpc-hc.exe.manifest.conf index 8d596f30f..ccdbd7a76 100644 --- a/src/apps/mplayerc/res/mpc-hc.exe.manifest.conf +++ b/src/apps/mplayerc/res/mpc-hc.exe.manifest.conf @@ -3,7 +3,7 @@ <assemblyIdentity
name="Media Player Classic Home Cinema"
processorArchitecture="*"
- version="1.5.0.$WCREV$"
+ version="1.5.1.$WCREV$"
type="win32"
/>
<description>Media Player Classic Home Cinema</description>
diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp index 4770a480d..96e8a544b 100644 --- a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp +++ b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp @@ -2057,7 +2057,7 @@ HRESULT CMPCVideoDecFilter::ConfigureDXVA2(IPin *pPin) }
// Patch for the Sandy Bridge (prevent crash on Mode_E, fixme later)
- if (m_nPCIVendor == PCIV_Intel && guidDecoder == DXVA2_ModeH264_E)
+ if (m_nPCIVendor == PCIV_Intel && pDecoderGuids[iGuid] == DXVA2_ModeH264_E)
continue;
if (bFoundDXVA2Configuration) {
|