diff options
| author | Spec-Chum <spec-chum@users.sourceforge.net> | 2010-05-24 02:23:54 +0400 |
|---|---|---|
| committer | Spec-Chum <spec-chum@users.sourceforge.net> | 2010-05-24 02:23:54 +0400 |
| commit | 7bffd4d229181b4a0ef55ad918bc9c31ceac605f (patch) | |
| tree | 1cae7e57eceb0e02950fc639b87753f61d037dfd /src/filters/muxer | |
| parent | 4e5b4e90f3651089dcc7d0697c768593242e9403 (diff) | |
Fixed some Intel C++ compiler errors, 32-bit MPC-HC can be compiled but the compiled exe has problems similar to vs2010 builds. We do not support the intel compiler, but patches are welcome. (thanks for the python script, Marko - really helped)
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1933 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/muxer')
| -rw-r--r-- | src/filters/muxer/BaseMuxer/BaseMuxerRelatedPin.h | 4 | ||||
| -rw-r--r-- | src/filters/muxer/BaseMuxer/BitStream.h | 4 | ||||
| -rw-r--r-- | src/filters/muxer/DSMMuxer/DSMMuxer.h | 4 | ||||
| -rw-r--r-- | src/filters/muxer/MatroskaMuxer/MatroskaMuxer.h | 8 | ||||
| -rw-r--r-- | src/filters/muxer/WavDest/WavDest.h | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/filters/muxer/BaseMuxer/BaseMuxerRelatedPin.h b/src/filters/muxer/BaseMuxer/BaseMuxerRelatedPin.h index 2b7f7095e..21765fded 100644 --- a/src/filters/muxer/BaseMuxer/BaseMuxerRelatedPin.h +++ b/src/filters/muxer/BaseMuxer/BaseMuxerRelatedPin.h @@ -21,8 +21,8 @@ #pragma once
-[uuid("EE6F2741-7DB4-4AAD-A3CB-545208EE4C0A")]
-interface IBaseMuxerRelatedPin : public IUnknown
+interface __declspec(uuid("EE6F2741-7DB4-4AAD-A3CB-545208EE4C0A"))
+IBaseMuxerRelatedPin : public IUnknown
{
STDMETHOD(SetRelatedPin) (CBasePin* pPin) = 0;
STDMETHOD_(CBasePin*, GetRelatedPin) () = 0;
diff --git a/src/filters/muxer/BaseMuxer/BitStream.h b/src/filters/muxer/BaseMuxer/BitStream.h index 26621660e..d3238b94a 100644 --- a/src/filters/muxer/BaseMuxer/BitStream.h +++ b/src/filters/muxer/BaseMuxer/BitStream.h @@ -21,8 +21,8 @@ #pragma once
-[uuid("30AB78C7-5259-4594-AEFE-9C0FC2F08A5E")]
-interface IBitStream : public IUnknown
+interface __declspec(uuid("30AB78C7-5259-4594-AEFE-9C0FC2F08A5E"))
+IBitStream : public IUnknown
{
STDMETHOD_(UINT64, GetPos) () = 0;
STDMETHOD_(UINT64, Seek) (UINT64 pos) = 0; // it's a _stream_, please don't seek if you don't have to
diff --git a/src/filters/muxer/DSMMuxer/DSMMuxer.h b/src/filters/muxer/DSMMuxer/DSMMuxer.h index 1d3269127..71fccc081 100644 --- a/src/filters/muxer/DSMMuxer/DSMMuxer.h +++ b/src/filters/muxer/DSMMuxer/DSMMuxer.h @@ -24,8 +24,8 @@ #include "../BaseMuxer/BaseMuxer.h"
#include <dsm/dsm.h>
-[uuid("C6590B76-587E-4082-9125-680D0693A97B")]
-class CDSMMuxerFilter : public CBaseMuxerFilter
+class __declspec(uuid("C6590B76-587E-4082-9125-680D0693A97B"))
+CDSMMuxerFilter : public CBaseMuxerFilter
{
bool m_fAutoChap, m_fAutoRes;
diff --git a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.h b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.h index 68bcdd2e0..21f259901 100644 --- a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.h +++ b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.h @@ -83,15 +83,15 @@ public: STDMETHODIMP Notify(IBaseFilter* pSender, Quality q);
};
-[uuid("38E2D43D-915D-493C-B373-888DB16EE3DC")]
-interface IMatroskaMuxer : public IUnknown
+interface __declspec(uuid("38E2D43D-915D-493C-B373-888DB16EE3DC"))
+IMatroskaMuxer : public IUnknown
{
STDMETHOD (CorrectTimeOffset) (bool fNegative, bool fPositive) = 0;
// TODO: chapters
};
-[uuid("1E1299A2-9D42-4F12-8791-D79E376F4143")]
-class CMatroskaMuxerFilter
+class __declspec(uuid("1E1299A2-9D42-4F12-8791-D79E376F4143"))
+CMatroskaMuxerFilter
: public CBaseFilter
, public CCritSec
, public CAMThread
diff --git a/src/filters/muxer/WavDest/WavDest.h b/src/filters/muxer/WavDest/WavDest.h index 84b054d32..cd1054ca9 100644 --- a/src/filters/muxer/WavDest/WavDest.h +++ b/src/filters/muxer/WavDest/WavDest.h @@ -32,8 +32,8 @@ public: HRESULT CheckMediaType(const CMediaType* pmt);
};
-[uuid("8685214E-4D32-4058-BE04-D01104F00B0C")]
-class CWavDestFilter : public CTransformFilter
+class __declspec(uuid("8685214E-4D32-4058-BE04-D01104F00B0C"))
+CWavDestFilter : public CTransformFilter
{
public:
CWavDestFilter(LPUNKNOWN pUnk, HRESULT* pHr);
|