From a9be8628b9be3e6696ebdd9a43a45344de436c80 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 22 Oct 2014 23:22:22 +0200
Subject: [PATCH] namespace fix, improve comment

---
 extern/ogre-ffmpeg-videoplayer/videodefs.hpp   | 5 +++++
 extern/ogre-ffmpeg-videoplayer/videoplayer.hpp | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/extern/ogre-ffmpeg-videoplayer/videodefs.hpp b/extern/ogre-ffmpeg-videoplayer/videodefs.hpp
index 5647d0b38..636b6f8d5 100644
--- a/extern/ogre-ffmpeg-videoplayer/videodefs.hpp
+++ b/extern/ogre-ffmpeg-videoplayer/videodefs.hpp
@@ -1,6 +1,9 @@
 #ifndef VIDEOPLAYER_DEFS_H
 #define VIDEOPLAYER_DEFS_H
 
+namespace Video
+{
+
 enum {
     AV_SYNC_AUDIO_MASTER, // Play audio with no frame drops, sync video to audio
     AV_SYNC_VIDEO_MASTER, // Play video with no frame drops, sync audio to video
@@ -9,4 +12,6 @@ enum {
     AV_SYNC_DEFAULT = AV_SYNC_EXTERNAL_MASTER
 };
 
+}
+
 #endif
diff --git a/extern/ogre-ffmpeg-videoplayer/videoplayer.hpp b/extern/ogre-ffmpeg-videoplayer/videoplayer.hpp
index 3c0ef15fd..750ad02e5 100644
--- a/extern/ogre-ffmpeg-videoplayer/videoplayer.hpp
+++ b/extern/ogre-ffmpeg-videoplayer/videoplayer.hpp
@@ -4,13 +4,10 @@
 #include <string>
 #include <memory>
 
-#include <boost/shared_ptr.hpp>
-
 namespace Video
 {
 
     struct VideoState;
-    class MovieAudioDecoder;
     class MovieAudioFactory;
 
     /**
@@ -22,6 +19,9 @@ namespace Video
         VideoPlayer();
         ~VideoPlayer();
 
+        /// @brief Set the MovieAudioFactory to use.
+        /// @par This class must be implemented by the user and is responsible for reading the decoded audio data.
+        /// @note If you do not set up a MovieAudioFactory, then audio streams will be ignored and the video will be played with no sound.
         /// @note Takes ownership of the passed pointer.
         void setAudioFactory (MovieAudioFactory* factory);