wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1133479 - Fixed media/gmp-clearkey build on mingw. r=cpearce

Browse Source
This commit is contained in:
Jacek Caban 2015-02-17 11:18:04 +01:00
parent cc26a13e4e
commit 6c24fa0989
5 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
media/gmp-clearkey/0.1/AnnexB.cpp
View File

@ -38,7 +38,7 @@ AnnexB::ConvertConfig(const std::vector<uint8_t>& aBuffer,
std::vector<uint8_t>& aOutAnnexB)
{
// Skip past irrelevant headers
auto& it = aBuffer.begin() + 5;
auto it = aBuffer.begin() + 5;
if (it >= aBuffer.end()) {
return;

2
media/gmp-clearkey/0.1/VideoDecoder.cpp
View File

@ -262,8 +262,6 @@ VideoDecoder::SampleToVideoFrame(IMFSample* aSample,
int32_t v_size = stride * (height + padding) / 4;
int32_t halfStride = (stride + 1) / 2;
int32_t halfHeight = (height + 1) / 2;
int32_t halfWidth = (width + 1) / 2;
int32_t totalSize = y_size + 2 * v_size;
GetPlatform()->syncrunonmainthread(WrapTask(aVideoFrame,
&GMPVideoi420Frame::CreateEmptyFrame,

4
media/gmp-clearkey/0.1/WMFAACDecoder.cpp
View File

@ -262,10 +262,6 @@ WMFAACDecoder::CreateOutputSample(IMFSample** aOutSample)
hr = MFCreateAlignedMemoryBuffer(bufferSize, alignment, &buffer);
ENSURE(SUCCEEDED(hr), hr);
DWORD maxLength = 0;
DWORD currentLength = 0;
BYTE* dst = nullptr;
hr = sample->AddBuffer(buffer);
ENSURE(SUCCEEDED(hr), hr);

4
media/gmp-clearkey/0.1/WMFH264Decoder.cpp
View File

@ -233,10 +233,6 @@ WMFH264Decoder::CreateOutputSample(IMFSample** aOutSample)
hr = MFCreateAlignedMemoryBuffer(bufferSize, alignment, &buffer);
ENSURE(SUCCEEDED(hr), hr);
DWORD maxLength = 0;
DWORD currentLength = 0;
BYTE* dst = nullptr;
hr = sample->AddBuffer(buffer);
ENSURE(SUCCEEDED(hr), hr);

4
media/gmp-clearkey/0.1/moz.build
View File

@ -35,6 +35,10 @@ if CONFIG['OS_ARCH'] == 'WINNT':
'WMFUtils.cpp',
]
OS_LIBS += [
'mfuuid',
]
DEFINES['ENABLE_WMF'] = True