actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Casting an rvalue to nonconst reference is illegal. I'm not positive why these are considered to be rvalues when they are cast.

Browse Source
This commit is contained in:
Steve Checkoway
2006-10-11 10:23:31 +00:00
parent 7046538f4e
commit 8ef7317b57
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+4 -1
View File
@@ -589,7 +589,10 @@ void MovieDecoder_FFMpeg::Close()
RageSurface *MovieDecoder_FFMpeg::CreateCompatibleSurface( int iTextureWidth, int iTextureHeight, bool bPreferHighColor ) RageSurface *MovieDecoder_FFMpeg::CreateCompatibleSurface( int iTextureWidth, int iTextureHeight, bool bPreferHighColor )
{ {
return MovieTexture_FFMpeg::AVCodecCreateCompatibleSurface( iTextureWidth, iTextureHeight, bPreferHighColor, (int&) m_AVTexfmt ); int temp = m_AVTexfmt;
RageSurface *surface = MovieTexture_FFMpeg::AVCodecCreateCompatibleSurface( iTextureWidth, iTextureHeight, bPreferHighColor, temp );
m_AVTexfmt = avcodec::PixelFormat( temp );
return surface;
} }
MovieTexture_FFMpeg::MovieTexture_FFMpeg( RageTextureID ID ): MovieTexture_FFMpeg::MovieTexture_FFMpeg( RageTextureID ID ):
stepmania/src/arch/MovieTexture/MovieTexture_Theora.cpp
+8 -2
View File
@@ -267,7 +267,10 @@ int MovieDecoder_Theora::GetFrame( RageSurface *pOut, float fTargetTime )
RageSurface *MovieDecoder_Theora::CreateCompatibleSurface( int iTextureWidth, int iTextureHeight, bool bPreferHighColor ) RageSurface *MovieDecoder_Theora::CreateCompatibleSurface( int iTextureWidth, int iTextureHeight, bool bPreferHighColor )
{ {
return MovieTexture_FFMpeg::AVCodecCreateCompatibleSurface( iTextureWidth, iTextureHeight, bPreferHighColor, (int&) m_OutputPixFmt ); int temp = m_OutputPixFmt;
RageSurface *surface = MovieTexture_FFMpeg::AVCodecCreateCompatibleSurface( iTextureWidth, iTextureHeight, bPreferHighColor, temp );
m_OutputPixFmt = avcodec::PixelFormat( temp );
return surface;
} }
void MovieDecoder_Theora::ConvertToSurface( RageSurface *pSurface ) const void MovieDecoder_Theora::ConvertToSurface( RageSurface *pSurface ) const
@@ -604,7 +607,10 @@ int MovieDecoder_Theora::GetFrame( RageSurface *pOut, float fTargetTime )
RageSurface *MovieDecoder_Theora::CreateCompatibleSurface( int iTextureWidth, int iTextureHeight, bool bPreferHighColor ) RageSurface *MovieDecoder_Theora::CreateCompatibleSurface( int iTextureWidth, int iTextureHeight, bool bPreferHighColor )
{ {
return MovieTexture_FFMpeg::AVCodecCreateCompatibleSurface( iTextureWidth, iTextureHeight, bPreferHighColor, (int&) m_OutputPixFmt ); int temp = m_OutputPixFmt;
RageSurface *surface = MovieTexture_FFMpeg::AVCodecCreateCompatibleSurface( iTextureWidth, iTextureHeight, bPreferHighColor, temp );
m_OutputPixFmt = avcodec::PixelFormat( temp );
return surface;
} }
void MovieDecoder_Theora::DecodeStripeStub( void *pCtx, theora_ycbcr_buffer yuv, int yfrag0, int yfrag_end ) void MovieDecoder_Theora::DecodeStripeStub( void *pCtx, theora_ycbcr_buffer yuv, int yfrag0, int yfrag_end )