Merge branch 'master' of https://github.com/zinnschlag/openmw into journal-open-sound

apps/openmw/mwgui/mapwindow.cpp

@@ -34,6 +34,10 @@ namespace MWGui
     {
     }
 
+    LocalMapBase::~LocalMapBase()
+    {
+    }
+
     void LocalMapBase::init(MyGUI::ScrollView* widget, MyGUI::ImageBox* compass, OEngine::GUI::Layout* layout, bool mapDragAndDrop)
     {
         mLocalMap = widget;

apps/openmw/mwgui/mapwindow.hpp

@@ -14,6 +14,7 @@ namespace MWGui
     {
     public:
         LocalMapBase();
+        virtual ~LocalMapBase();
         void init(MyGUI::ScrollView* widget, MyGUI::ImageBox* compass, OEngine::GUI::Layout* layout, bool mapDragAndDrop=false);
 
         void setCellPrefix(const std::string& prefix);

apps/openmw/mwgui/spellcreationdialog.cpp

@@ -416,6 +416,10 @@ namespace MWGui
         mAddEffectDialog.setVisible (false);
     }
 
+    EffectEditorBase::~EffectEditorBase()
+    {
+    }
+
     void EffectEditorBase::startEditing ()
     {
         // get the list of magic effects that are known to the player

apps/openmw/mwgui/spellcreationdialog.hpp

@@ -84,7 +84,7 @@ namespace MWGui
     {
     public:
         EffectEditorBase();
-
+        virtual ~EffectEditorBase();
 
     protected:
         std::map<int, short> mButtonMapping; // maps button ID to effect ID

apps/openmw/mwrender/videoplayer.cpp

@@ -32,9 +32,16 @@ namespace MWRender
 
 extern "C"
 {
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-#include <libswscale/swscale.h>
+    #include <libavcodec/avcodec.h>
+    #include <libavformat/avformat.h>
+    #include <libswscale/swscale.h>
+
+    // From libavformat version 55.0.100 and onward the declaration of av_gettime() is removed from libavformat/avformat.h and moved
+    // to libavutil/time.h
+    // https://github.com/FFmpeg/FFmpeg/commit/06a83505992d5f49846c18507a6c3eb8a47c650e
+    #if AV_VERSION_INT(55, 0, 100) <= AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, LIBAVFORMAT_VERSION_MINOR, LIBAVFORMAT_VERSION_MICRO)
+        #include <libavutil/time.h>
+    #endif
 }
 
 #define MAX_AUDIOQ_SIZE (5 * 16 * 1024)

credits.txt

@@ -32,6 +32,7 @@ Jacob Essex (Yacoby)
 Jannik Heller (scrawl)
 Jason Hooks (jhooks)
 Joel Graff (graffy)
+John Blomberg (fstp)
 Jordan Milne
 Julien Voisin (jvoisin/ap0)
 Karl-Felix Glatzer (k1ll)