shithub: openh264

Download patch

ref: f39f58e9db6d95bd60b4960762dded9c7c8d0221
parent: 15c71312d25084da4d36cd8c243de55f0cc9b0b5
author: Martin Storsjö <martin@martin.st>
date: Fri Apr 17 10:49:17 EDT 2015 

Avoid warnings about conversion from double to float


--- a/codec/console/dec/src/h264dec.cpp
+++ b/codec/console/dec/src/h264dec.cpp
@@ -305,7 +305,7 @@
 
 #if defined (WINDOWS_PHONE)
   g_dDecTime = dElapsed;
-  g_fDecFPS = (iFrameCount * 1.0) / dElapsed;
+  g_fDecFPS = (iFrameCount * 1.0f) / (float) dElapsed;
   g_iDecodedFrameNum = iFrameCount;
 #endif
 
--- a/codec/console/enc/src/welsenc.cpp
+++ b/codec/console/enc/src/welsenc.cpp
@@ -439,7 +439,7 @@
       sFileSet.uiFrameToBeCoded = atoi (argv[n++]);
 
     else if (!strcmp (pCommand, "-frin") && (n < argc))
-      pSvcParam.fMaxFrameRate = atof (argv[n++]);
+      pSvcParam.fMaxFrameRate = (float) atof (argv[n++]);
 
     else if (!strcmp (pCommand, "-numtl") && (n < argc))
       pSvcParam.iTemporalLayerNum = atoi (argv[n++]);
@@ -923,7 +923,7 @@
             sSvcParam.iPicWidth, sSvcParam.iPicHeight,
             iActualFrameEncodedCount, dElapsed, (iActualFrameEncodedCount * 1.0) / dElapsed);
 #if defined (WINDOWS_PHONE)
-    g_fFPS = (iActualFrameEncodedCount * 1.0) / dElapsed;
+    g_fFPS = (iActualFrameEncodedCount * 1.0f) / (float) dElapsed;
     g_dEncoderTime = dElapsed;
     g_iEncodedFrame = iActualFrameEncodedCount;
 #endif