Merge remote branch 'refs/remotes/fml/master'

[paraslash.git] / afh.h

diff --git a/afh.h b/afh.h
index 95cd0514224f0ab462daeff25011f742bbad44d3..6dfd03ed0d89d15568fa2096ada83909531d5bab 100644 (file)
--- a/afh.h
+++ b/afh.h
@@ -6,23 +6,6 @@
 
 /** \file afh.h structures for audio format handling (para_server) */
 
-/** \cond */
-#ifdef HAVE_OGGVORBIS
-#define OV_AUDIO_FORMAT " ogg"
-#else
-#define OV_AUDIO_FORMAT ""
-#endif
-
-#ifdef HAVE_FAAD
-#define AAC_AUDIO_FORMAT " aac"
-#else
-#define AAC_AUDIO_FORMAT ""
-#endif
-
-#define SUPPORTED_AUDIO_FORMATS "mp3 " OV_AUDIO_FORMAT AAC_AUDIO_FORMAT " wma "
-
-/** \endcond */
-
 /**
  * The tags used by all audio format handlers.
  *