commit 80c076b1c188757ebdec136f8c23540a2912f3a4 Author: Nicolas Vigier boklm@torproject.org Date: Wed Sep 30 14:37:18 2015 +0200

Fix double definition of MFVideoFormat_VP80 with mingw-w64 --- ...efinition-of-MFVideoFormat_VP80-with-m.mozpatch | 29 ++++++++++++++++++++ projects/instantbird/config | 2 ++ 2 files changed, 31 insertions(+)

diff --git a/projects/instantbird/0001-Avoid-double-definition-of-MFVideoFormat_VP80-with-m.mozpatch b/projects/instantbird/0001-Avoid-double-definition-of-MFVideoFormat_VP80-with-m.mozpatch new file mode 100644 index 0000000..f2f6f47 --- /dev/null +++ b/projects/instantbird/0001-Avoid-double-definition-of-MFVideoFormat_VP80-with-m.mozpatch @@ -0,0 +1,29 @@ +From dd5b8134fd85507d68ed79f9efbb3afc87ee9d7e Mon Sep 17 00:00:00 2001 +From: Nicolas Vigier boklm@torproject.org +Date: Wed, 30 Sep 2015 14:35:36 +0200 +Subject: [PATCH] Avoid double definition of MFVideoFormat_VP80 with mingw-w64 + +--- + dom/media/platforms/wmf/WMFVideoMFTManager.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/dom/media/platforms/wmf/WMFVideoMFTManager.cpp b/dom/media/platforms/wmf/WMFVideoMFTManager.cpp +index ba87a34bc6db..33ab0a4ad5a8 100644 +--- a/dom/media/platforms/wmf/WMFVideoMFTManager.cpp ++++ b/dom/media/platforms/wmf/WMFVideoMFTManager.cpp +@@ -31,6 +31,7 @@ using mozilla::layers::LayerManager; + using mozilla::layers::LayersBackend; + + #if MOZ_WINSDK_MAXVER < 0x0A000000 ++#if 0 + // Windows 10+ SDK has VP80 and VP90 defines + const GUID MFVideoFormat_VP80 = + { +@@ -48,6 +49,7 @@ const GUID MFVideoFormat_VP90 = + {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} + }; + #endif ++#endif + + const CLSID CLSID_WebmMfVp8Dec = + { diff --git a/projects/instantbird/config b/projects/instantbird/config index d5fec05..6da5a48 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -122,6 +122,8 @@ input_files: enable: '[% c("var/windows") %]' - filename: bug-1197282-include-atomic-in-videodecoder.mozpatch enable: '[% c("var/windows") %]' + - filename: 0001-Avoid-double-definition-of-MFVideoFormat_VP80-with-m.mozpatch + enable: '[% c("var/windows") %]' - filename: Bug-9173-Change-the-default-Firefox-profile-director.mozpatch - filename: block-plugins.mozpatch - filename: OSX-package-as-tar.bz2.mozpatch