From 83fd95c605e55cf1772e81e36df19552ff109c5c Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Wed, 9 Feb 2011 02:30:48 +0000
Subject: [PATCH] Some fixes to libmedia/video.h

Originally committed to SVN as r5327.
---
 aegisub/libmedia/include/libmedia/video.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/aegisub/libmedia/include/libmedia/video.h b/aegisub/libmedia/include/libmedia/video.h
index f5351905f..8df9b34d9 100644
--- a/aegisub/libmedia/include/libmedia/video.h
+++ b/aegisub/libmedia/include/libmedia/video.h
@@ -36,6 +36,11 @@
 
 #pragma once
 
+#ifndef MAGI_PRE
+#include <string>
+#endif
+
+#include <libmedia/factory_manager.h>
 #include <libmedia/video_frame.h>
 #include <libaegisub/exception.h>
 #include <libaegisub/vfr.h>
@@ -75,9 +80,9 @@ public:
 };
 
 
-class VideoProviderFactory : public Factory1<VideoProvider, wxString> {
+class VideoProviderFactory : public Factory1<VideoProvider, std::string> {
 public:
-	static VideoProvider *GetProvider(wxString video);
+	static VideoProvider *GetProvider(std::string video);
 	static void RegisterProviders();
 };