From f7ff8b33741b4a7fbf30d1e89d19b24253ec4a53 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Thu, 13 Dec 2012 03:13:44 -0800
Subject: [PATCH] A bit more cleanup

---
 apps/openmw/mwrender/videoplayer.cpp | 16 +++++++---------
 apps/openmw/mwrender/videoplayer.hpp |  3 +--
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwrender/videoplayer.cpp b/apps/openmw/mwrender/videoplayer.cpp
index d4fa7688f..94f40e0e9 100644
--- a/apps/openmw/mwrender/videoplayer.cpp
+++ b/apps/openmw/mwrender/videoplayer.cpp
@@ -791,8 +791,11 @@ public:
         int audio_index = -1;
         unsigned int i;
 
+        is->av_sync_type = DEFAULT_AV_SYNC_TYPE;
+        is->format_ctx = avformat_alloc_context();
         is->videoStream = -1;
         is->audioStream = -1;
+        is->refresh = 0;
         is->quit = 0;
 
         is->stream = Ogre::ResourceGroupManager::getSingleton ().openResource(resourceName);
@@ -886,6 +889,9 @@ public:
 
     void VideoPlayer::playVideo (const std::string &resourceName)
     {
+        // Register all formats and codecs
+        av_register_all();
+
         if (mState)
             close();
 
@@ -907,17 +913,9 @@ public:
 
         mState = new VideoState;
 
-        // Register all formats and codecs
-        av_register_all();
-
-        mState->refresh = 0;
-        mState->resourceName = resourceName;
-        mState->av_sync_type = DEFAULT_AV_SYNC_TYPE;
-        mState->format_ctx = avformat_alloc_context();
+        init_state(mState, resourceName);
 
         schedule_refresh(mState, 40);
-
-        init_state(mState, resourceName);
         mState->parse_thread = boost::thread(decode_thread, mState);
     }
 
diff --git a/apps/openmw/mwrender/videoplayer.hpp b/apps/openmw/mwrender/videoplayer.hpp
index e97fa6e13..2ce58846f 100644
--- a/apps/openmw/mwrender/videoplayer.hpp
+++ b/apps/openmw/mwrender/videoplayer.hpp
@@ -121,8 +121,7 @@ namespace MWRender
         boost::thread parse_thread;
         boost::thread video_thread;
 
-        std::string resourceName;
-        int quit;
+        volatile int quit;
 
         int refresh;
         int display_ready;