Merge remote-tracking branch 'cc9cii/master'

apps/openmw/mwgui/formatting.hpp

@@ -132,6 +132,7 @@ namespace MWGui
                 virtual int pageSplit();
 
             protected:
+                virtual ~GraphicElement() {}
                 MyGUI::Widget * mParent;
                 Paginator & mPaginator;
                 BlockStyle mBlockStyle;

cmake/FindOGRE.cmake

@@ -382,7 +382,6 @@ endmacro()
 ogre_find_component(Paging OgrePaging.h)
 # look for Overlay component
 ogre_find_component(Overlay OgreOverlaySystem.h)
-ogre_find_component(Overlay OgreOverlay.h)
 # look for Terrain component
 ogre_find_component(Terrain OgreTerrain.h)
 # look for Property component

extern/ogre-ffmpeg-videoplayer/videoplayer.cpp

@@ -1,5 +1,6 @@
 #include "videoplayer.hpp"
 
+#include "audiofactory.hpp"
 #include "videostate.hpp"
 
 namespace Video

extern/ogre-ffmpeg-videoplayer/videostate.cpp

@@ -221,7 +221,7 @@ void VideoState::video_refresh()
     }
     else
     {
-        const float threshold = 0.03;
+        const float threshold = 0.03f;
         if (this->pictq[pictq_rindex].pts > this->get_master_clock() + threshold)
             return; // not ready yet to show this picture