diff --git a/aegisub/libaegisub/common/ffms_audio.cpp b/aegisub/libaegisub/common/ffms_audio.cpp
index 82819963b..9d1c32ff5 100644
--- a/aegisub/libaegisub/common/ffms_audio.cpp
+++ b/aegisub/libaegisub/common/ffms_audio.cpp
@@ -26,7 +26,8 @@
 
 #include "ffms_audio.h"
 
-namespace ffms {
+namespace agi {
+	namespace ffms {
 
 
 /// @brief Constructor
@@ -217,4 +218,5 @@ void Audio::GetAudio(void *Buf, int64_t Start, int64_t Count) const {
 	}
 }
 
-} // namespace ffms
+	} // namespace ffms
+} // namespace agi
diff --git a/aegisub/libaegisub/common/ffms_audio.h b/aegisub/libaegisub/common/ffms_audio.h
index 800e9b924..afa3b6a3e 100644
--- a/aegisub/libaegisub/common/ffms_audio.h
+++ b/aegisub/libaegisub/common/ffms_audio.h
@@ -29,7 +29,8 @@
 #include <map>
 #endif
 
-namespace ffms {
+namespace agi {
+	namespace ffms {
 
 /// @class Audio
 /// Audio file support.
@@ -56,4 +57,5 @@ class Audio {
 
 };
 
-} // namespace ffms
+	} // namespace ffms
+} // namespace agi