From ee492d528436027bd41092a446fa600006c2ef18 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 20 Oct 2005 20:38:57 +0000 Subject: [PATCH] work around namespace error --- stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp | 4 ++-- stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.h | 4 +--- stepmania/src/arch/MovieTexture/MovieTexture_Theora.cpp | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp index eb2bafbb78..68b66c83a0 100644 --- a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp +++ b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp @@ -128,7 +128,7 @@ static int FindCompatibleAVFormat( bool bHighColor ) return -1; } -RageSurface *MovieTexture_FFMpeg::AVCodecCreateCompatibleSurface( int iTextureWidth, int iTextureHeight, avcodec::PixelFormat &iAVTexfmt ) +RageSurface *MovieTexture_FFMpeg::AVCodecCreateCompatibleSurface( int iTextureWidth, int iTextureHeight, int &iAVTexfmt ) { FixLilEndian(); @@ -581,7 +581,7 @@ void MovieDecoder_FFMpeg::Close() RageSurface *MovieDecoder_FFMpeg::CreateCompatibleSurface( int iTextureWidth, int iTextureHeight ) { - return MovieTexture_FFMpeg::AVCodecCreateCompatibleSurface( iTextureWidth, iTextureHeight, m_AVTexfmt ); + return MovieTexture_FFMpeg::AVCodecCreateCompatibleSurface( iTextureWidth, iTextureHeight, (int&) m_AVTexfmt ); } MovieTexture_FFMpeg::MovieTexture_FFMpeg( RageTextureID ID ): diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.h b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.h index 5b9e802e56..9a2e600096 100644 --- a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.h +++ b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.h @@ -8,14 +8,12 @@ #include #endif -namespace avcodec { enum PixelFormat; } - class MovieTexture_FFMpeg: public MovieTexture_Generic { public: MovieTexture_FFMpeg( RageTextureID ID ); - static RageSurface *AVCodecCreateCompatibleSurface( int iTextureWidth, int iTextureHeight, avcodec::PixelFormat &iAVTexfmt ); + static RageSurface *AVCodecCreateCompatibleSurface( int iTextureWidth, int iTextureHeight, int &iAVTexfmt ); }; #define USE_MOVIE_TEXTURE_FFMPEG diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_Theora.cpp b/stepmania/src/arch/MovieTexture/MovieTexture_Theora.cpp index e6d3767bc7..f28965ea3a 100644 --- a/stepmania/src/arch/MovieTexture/MovieTexture_Theora.cpp +++ b/stepmania/src/arch/MovieTexture/MovieTexture_Theora.cpp @@ -220,7 +220,7 @@ int MovieDecoder_Theora::GetFrame() RageSurface *MovieDecoder_Theora::CreateCompatibleSurface( int iTextureWidth, int iTextureHeight ) { - return MovieTexture_FFMpeg::AVCodecCreateCompatibleSurface( iTextureWidth, iTextureHeight, m_OutputPixFmt ); + return MovieTexture_FFMpeg::AVCodecCreateCompatibleSurface( iTextureWidth, iTextureHeight, (int&) m_OutputPixFmt ); } void MovieDecoder_Theora::ConvertToSurface( RageSurface *pSurface ) const