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

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2005-10-19 23:44:07 +00:00
parent f8d4610281
commit 34e63ee650
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+6 -6
View File
@@ -672,23 +672,23 @@ void MovieTexture_FFMpeg::CreateTexture()
m_iImageHeight = min( m_iSourceHeight, actualID.iMaxSize ); m_iImageHeight = min( m_iSourceHeight, actualID.iMaxSize );
/* Texture dimensions need to be a power of two; jump to the next. */ /* Texture dimensions need to be a power of two; jump to the next. */
m_iTextureWidth = power_of_two(m_iImageWidth); m_iTextureWidth = power_of_two( m_iImageWidth );
m_iTextureHeight = power_of_two(m_iImageHeight); m_iTextureHeight = power_of_two( m_iImageHeight );
/* Bogus assignment to shut gcc up. */ /* Bogus assignment to shut gcc up. */
PixelFormat pixfmt = PixelFormat_RGBA8; PixelFormat pixfmt = PixelFormat_RGBA8;
bool PreferHighColor = (TEXTUREMAN->GetPrefs().m_iMovieColorDepth == 32); bool bPreferHighColor = (TEXTUREMAN->GetPrefs().m_iMovieColorDepth == 32);
m_AVTexfmt = FindCompatibleAVFormat( pixfmt, PreferHighColor ); m_AVTexfmt = FindCompatibleAVFormat( pixfmt, bPreferHighColor );
if( m_AVTexfmt == -1 ) if( m_AVTexfmt == -1 )
m_AVTexfmt = FindCompatibleAVFormat( pixfmt, !PreferHighColor ); m_AVTexfmt = FindCompatibleAVFormat( pixfmt, !bPreferHighColor );
if( m_AVTexfmt == -1 ) if( m_AVTexfmt == -1 )
{ {
/* No dice. Use the first avcodec format of the preferred bit depth, /* No dice. Use the first avcodec format of the preferred bit depth,
* and let the display system convert. */ * and let the display system convert. */
for( m_AVTexfmt = 0; AVPixelFormats[m_AVTexfmt].bpp; ++m_AVTexfmt ) for( m_AVTexfmt = 0; AVPixelFormats[m_AVTexfmt].bpp; ++m_AVTexfmt )
if( AVPixelFormats[m_AVTexfmt].HighColor == PreferHighColor ) if( AVPixelFormats[m_AVTexfmt].HighColor == bPreferHighColor )
break; break;
ASSERT( AVPixelFormats[m_AVTexfmt].bpp ); ASSERT( AVPixelFormats[m_AVTexfmt].bpp );