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 919513 - content/media/directshow fails to compile on GCC. r=cpearce

Browse Source
This commit is contained in:
Jacek Caban 2013-09-24 10:41:00 +02:00
parent fda7a45f63
commit 822115bfb3
6 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/media/directshow/DirectShowReader.h
View File

@ -7,7 +7,7 @@
#if !defined(DirectShowReader_h_)
#define DirectShowReader_h_
#include "Windows.h" // HRESULT, DWORD
#include "windows.h" // HRESULT, DWORD
#include "MediaDecoderReader.h"
#include "mozilla/RefPtr.h"
#include "MP3FrameParser.h"

6
content/media/directshow/DirectShowUtils.cpp
View File

@ -4,9 +4,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "dshow.h"
#include "Dmodshow.h"
#include "Wmcodecdsp.h"
#include "Dmoreg.h"
#include "dmodshow.h"
#include "wmcodecdsp.h"
#include "dmoreg.h"
#include "DirectShowUtils.h"
#include "nsAutoPtr.h"
#include "mozilla/RefPtr.h"

11
content/media/directshow/SourceFilter.cpp
View File

@ -222,6 +222,13 @@ private:
};
// For mingw __uuidof support
#ifdef __CRT_UUID_DECL
}
__CRT_UUID_DECL(mozilla::OutputPin, 0x18e5cfb2,0x1015,0x440c,0xa6,0x5c,0xe6,0x38,0x53,0x23,0x58,0x94);
namespace mozilla {
#endif
OutputPin::OutputPin(MediaResource* aResource,
SourceFilter* aParent,
CriticalSection& aFilterLock,
@ -402,7 +409,7 @@ OutputPin::Request(IMediaSample* aSample, DWORD_PTR aDwUser)
if (!aSample) return E_FAIL;
CriticalSectionAutoEnter lock(*mLock);
NS_ASSERTION(!mFlushCount, __FUNCTION__"() while flushing");
NS_ASSERTION(!mFlushCount, "Request() while flushing");
if (mFlushCount)
return VFW_E_WRONG_STATE;
@ -463,7 +470,7 @@ OutputPin::WaitForNext(DWORD aTimeout,
mSignal.Wait();
}
nsAutoPtr<ReadRequest> request = reinterpret_cast<ReadRequest*>(mPendingReads.PopFront());
nsAutoPtr<ReadRequest> request(reinterpret_cast<ReadRequest*>(mPendingReads.PopFront()));
if (!request)
return VFW_E_WRONG_STATE;

5
content/media/directshow/SourceFilter.h
View File

@ -68,4 +68,9 @@ protected:
} // namespace mozilla
// For mingw __uuidof support
#ifdef __CRT_UUID_DECL
__CRT_UUID_DECL(mozilla::SourceFilter, 0x5c2a7ad0,0xba82,0x4659,0x91,0x78,0xc4,0x71,0x9a,0x27,0x65,0xd6);
#endif
#endif

9
media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseFilter.h
View File

@ -151,6 +151,15 @@ protected:
unsigned long mRefCnt;
};
// For mingw __uuidof support
#ifdef __CRT_UUID_DECL
}
}
__CRT_UUID_DECL(mozilla::media::BaseFilter, 0x4debd354,0xb0c6,0x44ab,0x93,0xcf,0x49,0xf6,0x4e,0xd3,0x6a,0xb8);
namespace mozilla {
namespace media {
#endif
_COM_SMARTPTR_TYPEDEF(BaseFilter, __uuidof(BaseFilter));
}

9
media/webrtc/trunk/webrtc/modules/video_capture/windows/BasePin.h
View File

@ -198,6 +198,15 @@ protected:
IEnumMediaTypes *aEnum);
};
// For mingw __uuidof support
#ifdef __CRT_UUID_DECL
}
}
__CRT_UUID_DECL(mozilla::media::BasePin, 0x199669c6,0x672a,0x4130,0xb1,0x3e,0x57,0xaa,0x83,0x0e,0xae,0x55);
namespace mozilla {
namespace media {
#endif
_COM_SMARTPTR_TYPEDEF(BasePin, __uuidof(BasePin));
}