diff mplayer.c @ 27370:14c5017f40d2

Change a bunch of video/audio-output-specific preprocessor directives from a HAVE_ prefix to a CONFIG_ prefix.
author diego
date Sun, 03 Aug 2008 15:21:40 +0000
parents d788e177a35e
children d58d06eafe83
line wrap: on
line diff
--- a/mplayer.c	Sat Aug 02 21:39:29 2008 +0000
+++ b/mplayer.c	Sun Aug 03 15:21:40 2008 +0000
@@ -112,7 +112,7 @@
 #include "stream/stream_radio.h"
 #endif
 
-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
 #include "stream/dvbin.h"
 #include "stream/cache2.h"
 #endif
@@ -198,7 +198,7 @@
     .set_of_sub_pos = -1,
     .file_format = DEMUXER_TYPE_UNKNOWN,
     .loop_times = -1,
-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
     .last_dvb_step = 1,
 #endif
 };
@@ -1143,7 +1143,7 @@
  * make it all work is to use the builtin SDL-bootstrap code, which 
  * will be done automatically by replacing our main() if we include SDL.h.
  */
-#if defined(__APPLE__) && defined(HAVE_SDL)
+#if defined(__APPLE__) && defined(CONFIG_SDL)
 #include <SDL.h>
 #endif
 
@@ -3410,7 +3410,7 @@
 
 if(!mpctx->sh_video && !mpctx->sh_audio){
     mp_msg(MSGT_CPLAYER,MSGL_FATAL, MSGTR_NoStreamFound);
-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
 	if(mpctx->stream->type == STREAMTYPE_DVB)
 	{
 		int dir;
@@ -3918,7 +3918,7 @@
 
 mp_msg(MSGT_GLOBAL,MSGL_V,"EOF code: %d  \n",mpctx->eof);
 
-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
 if(mpctx->dvbin_reopen)
 {
   mpctx->eof = 0;