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/transform/MpaDecFilter | |
| 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/transform/MpaDecFilter')
4 files changed, 7 insertions, 7 deletions
diff --git a/src/filters/transform/MpaDecFilter/IMpaDecFilter.h b/src/filters/transform/MpaDecFilter/IMpaDecFilter.h index cb044aa40..f018de415 100644 --- a/src/filters/transform/MpaDecFilter/IMpaDecFilter.h +++ b/src/filters/transform/MpaDecFilter/IMpaDecFilter.h @@ -34,8 +34,8 @@ enum DolbyDigitalMode };
-[uuid("2067C60F-752F-4EBD-B0B1-4CBC5E00741C")]
-interface IMpaDecFilter : public IUnknown
+interface __declspec(uuid("2067C60F-752F-4EBD-B0B1-4CBC5E00741C"))
+IMpaDecFilter : public IUnknown
{
enum enctype {ac3, dts, aac, etlast};
diff --git a/src/filters/transform/MpaDecFilter/MpaDecFilter.h b/src/filters/transform/MpaDecFilter/MpaDecFilter.h index 6c1711fae..a7de54e8a 100644 --- a/src/filters/transform/MpaDecFilter/MpaDecFilter.h +++ b/src/filters/transform/MpaDecFilter/MpaDecFilter.h @@ -83,8 +83,8 @@ struct AVFrame; struct AVCodecParserContext;
-[uuid("3D446B6F-71DE-4437-BE15-8CE47174340F")]
-class CMpaDecFilter
+class __declspec(uuid("3D446B6F-71DE-4437-BE15-8CE47174340F"))
+CMpaDecFilter
: public CTransformFilter
, public IMpaDecFilter
, public ISpecifyPropertyPages2
diff --git a/src/filters/transform/MpaDecFilter/MpaDecSettingsWnd.h b/src/filters/transform/MpaDecFilter/MpaDecSettingsWnd.h index cf459b705..02ae9a172 100644 --- a/src/filters/transform/MpaDecFilter/MpaDecSettingsWnd.h +++ b/src/filters/transform/MpaDecFilter/MpaDecSettingsWnd.h @@ -25,8 +25,8 @@ #include "MpaDecFilter.h"
#include <afxcmn.h>
-[uuid("24103041-884B-4772-B0D3-A600E7CBFEC7")]
-class CMpaDecSettingsWnd : public CInternalPropertyPageWnd
+class __declspec(uuid("24103041-884B-4772-B0D3-A600E7CBFEC7"))
+CMpaDecSettingsWnd : public CInternalPropertyPageWnd
{
CComQIPtr<IMpaDecFilter> m_pMDF;
diff --git a/src/filters/transform/MpaDecFilter/faad2/libfaad/common.h b/src/filters/transform/MpaDecFilter/faad2/libfaad/common.h index b696b4a9e..21657c003 100644 --- a/src/filters/transform/MpaDecFilter/faad2/libfaad/common.h +++ b/src/filters/transform/MpaDecFilter/faad2/libfaad/common.h @@ -346,7 +346,7 @@ char *strchr(), *strrchr(); #ifdef __ICL /* only Intel C compiler has fmath ??? */ - #include <mathf.h> + //#include <mathf.h> #define sin sinf #define cos cosf |