From 0c15005cc2f0fbe75266b09dfaf63aec879a584d Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Sun, 6 Feb 2011 03:32:18 +0000
Subject: [PATCH] Add files to media namespace.

Originally committed to SVN as r5305.
---
 aegisub/libmedia/video/avs_video.cpp   | 4 ++++
 aegisub/libmedia/video/avs_video.h     | 5 +++++
 aegisub/libmedia/video/dummy_video.cpp | 5 +++++
 aegisub/libmedia/video/dummy_video.h   | 5 +++++
 aegisub/libmedia/video/yuv4mpeg.cpp    | 5 +++++
 aegisub/libmedia/video/yuv4mpeg.h      | 5 +++++
 6 files changed, 29 insertions(+)

diff --git a/aegisub/libmedia/video/avs_video.cpp b/aegisub/libmedia/video/avs_video.cpp
index 7d35288ee..b06c6ca6d 100644
--- a/aegisub/libmedia/video/avs_video.cpp
+++ b/aegisub/libmedia/video/avs_video.cpp
@@ -52,6 +52,8 @@
 #include "video_context.h"
 #include "video_provider_avs.h"
 
+namespace media {
+
 /// @brief Constructor 
 /// @param _filename 
 ///
@@ -289,3 +291,5 @@ wxString AvisynthVideoProvider::GetWarning() const {
 }
 
 #endif
+
+} // namespace media
diff --git a/aegisub/libmedia/video/avs_video.h b/aegisub/libmedia/video/avs_video.h
index b6a024fca..358fbe054 100644
--- a/aegisub/libmedia/video/avs_video.h
+++ b/aegisub/libmedia/video/avs_video.h
@@ -38,6 +38,8 @@
 #include "avisynth_wrap.h"
 #include "include/aegisub/video_provider.h"
 
+namespace media {
+
 /// DOCME
 /// @class AvisynthVideoProvider
 /// @brief DOCME
@@ -97,3 +99,6 @@ public:
 	wxString GetDecoderName() const { return wxString(L"Avisynth/") + decoderName; }
 };
 #endif
+
+} // namespace media
+
diff --git a/aegisub/libmedia/video/dummy_video.cpp b/aegisub/libmedia/video/dummy_video.cpp
index c36c8c869..f715e4441 100644
--- a/aegisub/libmedia/video/dummy_video.cpp
+++ b/aegisub/libmedia/video/dummy_video.cpp
@@ -43,6 +43,8 @@
 #include "colorspace.h"
 #include "video_provider_dummy.h"
 
+namespace media {
+
 /// @brief Constructor 
 /// @param _fps    
 /// @param frames  
@@ -216,3 +218,6 @@ const AegiVideoFrame DummyVideoProvider::GetFrame(int n) {
 	lastFrame = n;
 	return frame;
 }
+
+} // namespace media
+
diff --git a/aegisub/libmedia/video/dummy_video.h b/aegisub/libmedia/video/dummy_video.h
index d57b42a92..a3ddfa408 100644
--- a/aegisub/libmedia/video/dummy_video.h
+++ b/aegisub/libmedia/video/dummy_video.h
@@ -42,6 +42,8 @@
 
 #include "include/aegisub/video_provider.h"
 
+namespace media {
+
 /// DOCME
 /// @class DummyVideoProvider
 /// @brief DOCME
@@ -84,3 +86,6 @@ public:
 	std::vector<int> GetKeyFrames() const { return std::vector<int>(); };
 	wxString GetDecoderName() const { return L"Dummy Video Provider"; }
 };
+
+} // namespace media
+
diff --git a/aegisub/libmedia/video/yuv4mpeg.cpp b/aegisub/libmedia/video/yuv4mpeg.cpp
index d7d032fd0..82b1fc066 100644
--- a/aegisub/libmedia/video/yuv4mpeg.cpp
+++ b/aegisub/libmedia/video/yuv4mpeg.cpp
@@ -42,6 +42,8 @@
 #include "utils.h"
 #include "video_provider_yuv4mpeg.h"
 
+namespace media {
+
 // All of this cstdio bogus is because of one reason and one reason only:
 // MICROSOFT'S IMPLEMENTATION OF STD::FSTREAM DOES NOT SUPPORT FILES LARGER THAN 2 GB.
 // (yes, really)
@@ -419,3 +421,6 @@ const AegiVideoFrame YUV4MPEGVideoProvider::GetFrame(int n) {
 
 	return dst_frame;
 }
+
+} // namespace media
+
diff --git a/aegisub/libmedia/video/yuv4mpeg.h b/aegisub/libmedia/video/yuv4mpeg.h
index 87031f4bb..4d92928fd 100644
--- a/aegisub/libmedia/video/yuv4mpeg.h
+++ b/aegisub/libmedia/video/yuv4mpeg.h
@@ -44,6 +44,8 @@
 #include <wx/log.h>
 #endif
 
+namespace media {
+
 /// the maximum allowed header length, in bytes
 #define YUV4MPEG_HEADER_MAXLEN 128
 
@@ -152,3 +154,6 @@ public:
 	wxString GetDecoderName() const       { return L"YU4MPEG"; };
 	bool WantsCaching() const             { return true; };
 };
+
+} // namespace media
+