Kill the ffms2 group and make it all 'ffms'

Originally committed to SVN as r3335.
2009-07-30 06:40:25 +00:00 · 2009-07-30 06:40:25 +00:00 · 2fcd872218
commit 2fcd872218
parent cdfbcd6681
6 changed files with 5 additions and 7 deletions
--- 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
--- 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

--- 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"
--- 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
 ///

 ///////////
--- 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"
--- 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