diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-25 19:57:31 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-25 19:57:31 +0000 |
| commit | 5572645334fb3a9a46fce6e8ddc626ee3cd21d27 (patch) | |
| tree | dd87876d1dd2c9d641605bec68bef84924f27754 /libaf | |
| parent | 8069102bca4b2f75c62f667931efea6e303598ed (diff) | |
| download | mpv-5572645334fb3a9a46fce6e8ddc626ee3cd21d27.tar.bz2 mpv-5572645334fb3a9a46fce6e8ddc626ee3cd21d27.tar.xz | |
Remove config.h and move its content to af.h. There are multiple files under
the name config.h, inviting bugs and confusion.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21249 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libaf')
| -rw-r--r-- | libaf/af.h | 5 | ||||
| -rw-r--r-- | libaf/config.h | 25 |
2 files changed, 5 insertions, 25 deletions
diff --git a/libaf/af.h b/libaf/af.h index 4c867328cc..09a64a3392 100644 --- a/libaf/af.h +++ b/libaf/af.h @@ -10,6 +10,11 @@ struct af_instance_s; +// Number of channels +#ifndef AF_NCH +#define AF_NCH 6 +#endif + // Audio data chunk typedef struct af_data_s { diff --git a/libaf/config.h b/libaf/config.h deleted file mode 100644 index 197cc5ae43..0000000000 --- a/libaf/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/*============================================================================= -// -// This software has been released under the terms of the GNU General Public -// license. See http://www.gnu.org/copyleft/gpl.html for details. -// -// Copyright 2002 Anders Johansson ajh@watri.uwa.edu.au -// -//============================================================================= -*/ - -#ifndef __af_config_h__ -#define __af_config_h__ - -#include "../config.h" // WORDS_BIGENDIAN - -#ifndef MPLAYER_CONFIG_H -#error Mandatory WORDS_BIGENDIAN does not contain 0 nor 1 -#endif - -// Number of channels -#ifndef AF_NCH -#define AF_NCH 6 -#endif - -#endif /* __af_config_h__ */ |