Merge pull request #1512 from mstorsjo/add-float-cast

Add a cast when converting from double to float

ruil2 committed 12 years ago

Commit fc811a82 parents 843955b c8afd151 file · +1 −1Browse files

Showing the changes to codec/decoder (1 of 1 file). Show all

Unified · Split

codec/decoder/plus/src/welsDecoderExt.cpp+1−1

@@ -369,7 +369,7 @@ long CWelsDecoder::GetOption (DECODER_OPTION eOptID, void* pOption) { · 368 unmodified lines
369		369
370	memcpy (pDecoderStatistics, &m_pDecContext->sDecoderStatistics, sizeof (SDecoderStatistics));	370	memcpy (pDecoderStatistics, &m_pDecContext->sDecoderStatistics, sizeof (SDecoderStatistics));
371		371
372	pDecoderStatistics->fAverageFrameSpeedInMs = (m_pDecContext->dDecTime) /	372	pDecoderStatistics->fAverageFrameSpeedInMs = (float) (m_pDecContext->dDecTime) /
373	(m_pDecContext->sDecoderStatistics.uiDecodedFrameCount);	373	(m_pDecContext->sDecoderStatistics.uiDecodedFrameCount);
374	memset (&m_pDecContext->sDecoderStatistics, 0, sizeof (SDecoderStatistics));	374	memset (&m_pDecContext->sDecoderStatistics, 0, sizeof (SDecoderStatistics));
375	m_pDecContext->dDecTime = 0;	375	m_pDecContext->dDecTime = 0;