From e01795556f3a04b4e5ff202e7c154df09b85080d Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Sat, 25 Oct 2014 10:37:57 +1100
Subject: [PATCH 1/3] Suppress some warnings for MSVC.

---
 apps/openmw/mwgui/formatting.hpp                | 1 +
 extern/ogre-ffmpeg-videoplayer/audiofactory.hpp | 1 +
 extern/ogre-ffmpeg-videoplayer/videostate.cpp   | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/formatting.hpp b/apps/openmw/mwgui/formatting.hpp
index 3e21b62e2..5b7925057 100644
--- a/apps/openmw/mwgui/formatting.hpp
+++ b/apps/openmw/mwgui/formatting.hpp
@@ -132,6 +132,7 @@ namespace MWGui
                 virtual int pageSplit();
 
             protected:
+                virtual ~GraphicElement() {}
                 MyGUI::Widget * mParent;
                 Paginator & mPaginator;
                 BlockStyle mBlockStyle;
diff --git a/extern/ogre-ffmpeg-videoplayer/audiofactory.hpp b/extern/ogre-ffmpeg-videoplayer/audiofactory.hpp
index cf1ff46a8..06abd6a74 100644
--- a/extern/ogre-ffmpeg-videoplayer/audiofactory.hpp
+++ b/extern/ogre-ffmpeg-videoplayer/audiofactory.hpp
@@ -12,6 +12,7 @@ class MovieAudioFactory
 {
 public:
     virtual boost::shared_ptr<MovieAudioDecoder> createDecoder(VideoState* videoState) = 0;
+    virtual ~MovieAudioFactory() {}
 };
 
 }
diff --git a/extern/ogre-ffmpeg-videoplayer/videostate.cpp b/extern/ogre-ffmpeg-videoplayer/videostate.cpp
index c77723421..ece491edc 100644
--- a/extern/ogre-ffmpeg-videoplayer/videostate.cpp
+++ b/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
 

From 69d0c7fd7090b84729fbd3ca48870b0501f1ffb4 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Sat, 25 Oct 2014 10:40:33 +1100
Subject: [PATCH 2/3] Cleanup leftover from previous osx support attempts.

---
 cmake/FindOGRE.cmake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cmake/FindOGRE.cmake b/cmake/FindOGRE.cmake
index 51589698f..f2acf9d33 100644
--- a/cmake/FindOGRE.cmake
+++ b/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

From ea67cf0ebeb87e29db96c555c2be217bdd91bba0 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Sat, 25 Oct 2014 15:37:09 +1100
Subject: [PATCH 3/3] Try the fix again.

---
 extern/ogre-ffmpeg-videoplayer/audiofactory.hpp | 1 -
 extern/ogre-ffmpeg-videoplayer/videoplayer.cpp  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/extern/ogre-ffmpeg-videoplayer/audiofactory.hpp b/extern/ogre-ffmpeg-videoplayer/audiofactory.hpp
index 06abd6a74..cf1ff46a8 100644
--- a/extern/ogre-ffmpeg-videoplayer/audiofactory.hpp
+++ b/extern/ogre-ffmpeg-videoplayer/audiofactory.hpp
@@ -12,7 +12,6 @@ class MovieAudioFactory
 {
 public:
     virtual boost::shared_ptr<MovieAudioDecoder> createDecoder(VideoState* videoState) = 0;
-    virtual ~MovieAudioFactory() {}
 };
 
 }
diff --git a/extern/ogre-ffmpeg-videoplayer/videoplayer.cpp b/extern/ogre-ffmpeg-videoplayer/videoplayer.cpp
index 434b676ee..5487e916a 100644
--- a/extern/ogre-ffmpeg-videoplayer/videoplayer.cpp
+++ b/extern/ogre-ffmpeg-videoplayer/videoplayer.cpp
@@ -1,5 +1,6 @@
 #include "videoplayer.hpp"
 
+#include "audiofactory.hpp"
 #include "videostate.hpp"
 
 namespace Video