2 CWFs in videoomx.h

diff --git a/videoomx.h b/videoomx.h
index 11433494243f37d5d68bdfcada0c9a4e0aeb1212..c78e5e6216fb3dad6ca15bbd3a9113d30fd4f114 100644 (file)
--- a/videoomx.h
+++ b/videoomx.h
@@ -132,17 +132,16 @@ class VideoOMX : public Video
     int test2();
 #endif
 
-
-
-    static inline OMX_TICKS intToOMXTicks(long long pts) {
-       OMX_TICKS temp;
-       temp.nLowPart=pts;
-       temp.nHighPart=pts>>32;
-       return temp;
+    static inline OMX_TICKS intToOMXTicks(long long pts)
+    {
+      OMX_TICKS temp;
+      // Assigning a long long int to an int drops the MSBs which is what we want here
+      // But to avoid a -Wconversion warning, cast it
+      temp.nLowPart = static_cast<OMX_U32>(pts);
+      temp.nHighPart = static_cast<OMX_U32>(pts >> 32);
+      return temp;
     }
 
-
-
   private:
           int EnterIframePlayback();
           bool iframemode;