Mercurial > mplayer.hg

diff mplayer.c @ 27359:d788e177a35e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate; CONFIG_ prefix for configurable options, HAVE_ for system-dependent stuff.
author diego
date Fri, 01 Aug 2008 20:28:58 +0000
parents b597fd2924b4
children 14c5017f40d2
line wrap: on
line diff
--- a/mplayer.c	Fri Aug 01 18:10:01 2008 +0000
+++ b/mplayer.c	Fri Aug 01 20:28:58 2008 +0000
@@ -1027,7 +1027,7 @@
     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 @@
       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