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 869283 - fix gcc warnings in wmf r=cpearce

Browse Source
This commit is contained in:
Trevor Saunders 2013-05-06 21:58:55 -04:00
parent 38290d61ce
commit c31f209f87
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
content/media/wmf/WMFReader.cpp
View File

@ -51,8 +51,8 @@ WMFReader::WMFReader(AbstractMediaDecoder* aDecoder)
mHasAudio(false),
mHasVideo(false),
mCanSeek(false),
mIsMP3Enabled(WMFDecoder::IsMP3Supported()),
mUseHwAccel(false)
mUseHwAccel(false),
mIsMP3Enabled(WMFDecoder::IsMP3Supported())
{
NS_ASSERTION(NS_IsMainThread(), "Must be on main thread.");
MOZ_COUNT_CTOR(WMFReader);
@ -789,7 +789,6 @@ WMFReader::CreateD3DVideoFrame(IMFSample* aSample,
*aOutVideoData = nullptr;
HRESULT hr;
ImageFormat format = D3D9_RGB32_TEXTURE;
nsRefPtr<Image> image;
hr = mDXVA2Manager->CopyToImage(aSample,
nsIntSize(mPictureRegion.width, mPictureRegion.height),

4
content/media/wmf/WMFSourceReaderCallback.cpp
View File

@ -37,12 +37,12 @@ NS_IMPL_THREADSAFE_ADDREF(WMFSourceReaderCallback)
NS_IMPL_THREADSAFE_RELEASE(WMFSourceReaderCallback)
WMFSourceReaderCallback::WMFSourceReaderCallback()
: mResultStatus(S_OK)
: mMonitor("WMFSourceReaderCallback")
, mResultStatus(S_OK)
, mStreamFlags(0)
, mTimestamp(0)
, mSample(nullptr)
, mReadFinished(false)
, mMonitor("WMFSourceReaderCallback")
{
#ifdef PR_LOGGING
if (!gWMFSourceReaderCallbackLog) {

2
content/media/wmf/WMFSourceReaderCallback.h
View File

@ -19,7 +19,7 @@ namespace mozilla {
// WMFByteStream's underlying MediaResource is closed. This ensures that
// the decode threads don't get stuck in a synchronous ReadSample() call
// when the MediaResource is unexpectedly shutdown.
class WMFSourceReaderCallback : public IMFSourceReaderCallback
class WMFSourceReaderCallback MOZ_FINAL : public IMFSourceReaderCallback
{
public:
WMFSourceReaderCallback();