shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #2942 from mstorsjo/fix-msvc-warning

Avoid a warning with MSVC about converting from double to float

--- a/codec/encoder/plus/src/welsEncoderExt.cpp

+++ b/codec/encoder/plus/src/welsEncoderExt.cpp

@@ -646,7 +646,7 @@

                                   pStatistics->iLastStatisticsFrameCount);

     if (kiDeltaFrames > (m_pEncContext->pSvcParam->fMaxFrameRate * 2)) {

       if (kiTimeDiff >= m_pEncContext->iStatisticsLogInterval) {

-        float fTimeDiffSec = kiTimeDiff / 1000.0;

+        float fTimeDiffSec = kiTimeDiff / 1000.0f;

         pStatistics->fLatestFrameRate = static_cast<float> ((pStatistics->uiInputFrameCount -

                                         pStatistics->iLastStatisticsFrameCount) / fTimeDiffSec);

         pStatistics->uiBitRate = static_cast<unsigned int> ((pStatistics->iTotalEncodedBytes) * 8  / fTimeDiffSec);