From a3b2a76e608f8765658475a4283b63c73aac2e94 Mon Sep 17 00:00:00 2001
From: fstp <johnblo@kth.se>
Date: Sun, 9 Jun 2013 23:08:57 +0200
Subject: [PATCH 1/3] Added virtual destructors to classes LocalMapBase and
 EffectEditorBase.

---
 apps/openmw/mwgui/mapwindow.cpp           | 4 ++++
 apps/openmw/mwgui/mapwindow.hpp           | 1 +
 apps/openmw/mwgui/spellcreationdialog.cpp | 4 ++++
 apps/openmw/mwgui/spellcreationdialog.hpp | 2 +-
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 4a78238ce..7098853af 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/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;
diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp
index 18c81a060..3aefc398c 100644
--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/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);
diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
index 45cf1b0aa..c4c1be711 100644
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/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
diff --git a/apps/openmw/mwgui/spellcreationdialog.hpp b/apps/openmw/mwgui/spellcreationdialog.hpp
index 5ad306fbe..61b888491 100644
--- a/apps/openmw/mwgui/spellcreationdialog.hpp
+++ b/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

From 9d6d200d228e2f03cecc1264f8333442eb6c2c93 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Mon, 10 Jun 2013 10:25:02 +0200
Subject: [PATCH 2/3] updated credits file

---
 credits.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/credits.txt b/credits.txt
index 390a2d721..630f6ff39 100644
--- a/credits.txt
+++ b/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)

From 98e5cb6d7b6b33144bec9649e2f92ec4e570474d Mon Sep 17 00:00:00 2001
From: fstp <johnblo@kth.se>
Date: Mon, 10 Jun 2013 15:10:39 +0200
Subject: [PATCH 3/3] Added ifdef to keep backward compatibility with the
 FFmpeg library.

---
 apps/openmw/mwrender/videoplayer.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwrender/videoplayer.cpp b/apps/openmw/mwrender/videoplayer.cpp
index 87ae8175d..1b5eddc21 100644
--- a/apps/openmw/mwrender/videoplayer.cpp
+++ b/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)