From 2fcd8722183f8a8d019aef5ef9dbd3e4cdf02685 Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Thu, 30 Jul 2009 06:40:25 +0000
Subject: [PATCH] Kill the ffms2 group and make it all 'ffms'

Originally committed to SVN as r3335.
---
 aegisub/docs/doxygen/groups.dox             | 1 -
 aegisub/docs/doxygen/pages/index.dox        | 1 -
 aegisub/src/audio_provider_ffmpegsource.cpp | 2 +-
 aegisub/src/audio_provider_ffmpegsource.h   | 2 +-
 aegisub/src/ffmpegsource_common.cpp         | 4 ++--
 aegisub/src/ffmpegsource_common.h           | 2 +-
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/aegisub/docs/doxygen/groups.dox b/aegisub/docs/doxygen/groups.dox
index dfc17b8c0..038c14118 100644
--- a/aegisub/docs/doxygen/groups.dox
+++ b/aegisub/docs/doxygen/groups.dox
@@ -7,7 +7,6 @@
 @defgroup custom_control Custom Control
 @defgroup export Export
 @defgroup ffms FFmpegSource support.
-@defgroup ffms2 FFmpegSource2 support.
 @defgroup font_collector Font collector
 @defgroup kanji_timer Kanji Timer
 @defgroup libosxutil libosxutil
diff --git a/aegisub/docs/doxygen/pages/index.dox b/aegisub/docs/doxygen/pages/index.dox
index 538b3aed1..3ae3cc409 100644
--- a/aegisub/docs/doxygen/pages/index.dox
+++ b/aegisub/docs/doxygen/pages/index.dox
@@ -13,7 +13,6 @@ Main
 
 Library
  - @ref ffms
- - @ref ffms2
  - @ref quicktime
  - @ref matroska
 
diff --git a/aegisub/src/audio_provider_ffmpegsource.cpp b/aegisub/src/audio_provider_ffmpegsource.cpp
index 0f5f37279..34d6cc192 100644
--- a/aegisub/src/audio_provider_ffmpegsource.cpp
+++ b/aegisub/src/audio_provider_ffmpegsource.cpp
@@ -31,7 +31,7 @@
 
 /// @file audio_provider_ffmpegsource.cpp
 /// @brief ffms2-based audio provider
-/// @ingroup audio_input ffms2
+/// @ingroup audio_input ffms
 ///
 
 #include "config.h"
diff --git a/aegisub/src/audio_provider_ffmpegsource.h b/aegisub/src/audio_provider_ffmpegsource.h
index 004e3db73..89a3c5040 100644
--- a/aegisub/src/audio_provider_ffmpegsource.h
+++ b/aegisub/src/audio_provider_ffmpegsource.h
@@ -31,7 +31,7 @@
 
 /// @file audio_provider_ffmpegsource.h
 /// @see audio_provider_ffmpegsource.cpp
-/// @ingroup audio_input ffms2
+/// @ingroup audio_input ffms
 ///
 
 ///////////
diff --git a/aegisub/src/ffmpegsource_common.cpp b/aegisub/src/ffmpegsource_common.cpp
index fc5f5f661..90f2ea807 100644
--- a/aegisub/src/ffmpegsource_common.cpp
+++ b/aegisub/src/ffmpegsource_common.cpp
@@ -30,8 +30,8 @@
 // $Id$
 
 /// @file ffmpegsource_common.cpp
-/// @brief Shared code for ffms2 video and audio providers
-/// @ingroup video_input audio_input ffms2
+/// @brief Shared code for ffms video and audio providers
+/// @ingroup video_input audio_input ffms
 ///
 
 #include "config.h"
diff --git a/aegisub/src/ffmpegsource_common.h b/aegisub/src/ffmpegsource_common.h
index 235bafa9e..58c6cd3bb 100644
--- a/aegisub/src/ffmpegsource_common.h
+++ b/aegisub/src/ffmpegsource_common.h
@@ -31,7 +31,7 @@
 
 /// @file ffmpegsource_common.h
 /// @see ffmpegsource_common.cpp
-/// @ingroup video_input audio_input ffms2
+/// @ingroup video_input audio_input ffms
 ///
 
 #pragma once