summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-01 20:28:58 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-01 20:28:58 +0000
commitd17f9943af8aeeca65b327ad22475b4df36a3b2d (patch)
tree2e92c593409a4e3222d2524460178cf133af8f86 /mplayer.c
parent95c0b67d60690dfca422eab3d28bdac9a3e46921 (diff)
downloadmpv-d17f9943af8aeeca65b327ad22475b4df36a3b2d.tar.bz2
mpv-d17f9943af8aeeca65b327ad22475b4df36a3b2d.tar.xz
Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate;
CONFIG_ prefix for configurable options, HAVE_ for system-dependent stuff. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27391 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mplayer.c b/mplayer.c
index 90688fb9f2..31fa4408a8 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1027,7 +1027,7 @@ void add_subtitles(char *filename, float fps, int noerr)
subd = sub_read_file(filename, fps);
#ifdef CONFIG_ASS
if (ass_enabled)
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
asst = ass_read_file(ass_library, filename, sub_cp);
#else
asst = ass_read_file(ass_library, filename, 0);
@@ -2850,7 +2850,7 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){
mp_msg(MSGT_CPLAYER, MSGL_V, "Using %s timing\n",
softsleep?"software":timer_name);
-#ifdef CONFIG_TERMCAP
+#ifdef HAVE_TERMCAP
if ( !use_gui ) load_termcap(NULL); // load key-codes
#endif