Change a bunch of codec-specific preprocessor directives from a HAVE_

prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27395 b3059339-0415-0410-9bf9-f77b7e298cf2

4 files changed, 11 insertions, 11 deletions

diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c
index afd20d6e02..a688f3b125 100644
--- a/libmpdemux/demux_avi.c
+++ b/libmpdemux/demux_avi.c
@@ -828,7 +828,7 @@ static demuxer_t* demux_open_hack_avi(demuxer_t *demuxer)
    if(!demuxer) return NULL; // failed to open
    sh_a = demuxer->audio->sh;
    if(demuxer->audio->id != -2 && sh_a) {
-#ifdef HAVE_OGGVORBIS
+#ifdef CONFIG_OGGVORBIS
     // support for Ogg-in-AVI:
     if(sh_a->format == 0xFFFE)
       demuxer = init_avi_with_ogg(demuxer);
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c
index 761d332e75..3c5a38bf82 100644
--- a/libmpdemux/demux_ogg.c
+++ b/libmpdemux/demux_ogg.c
@@ -27,7 +27,7 @@
 #include <vorbis/codec.h>
 #endif
 
-#ifdef HAVE_OGGTHEORA
+#ifdef CONFIG_OGGTHEORA
 #include <theora/theora.h>
 extern int _ilog (unsigned int); /* defined in many places in theora/lib/ */
 #endif
@@ -38,7 +38,7 @@ extern int _ilog (unsigned int); /* defined in many places in theora/lib/ */
  * without using theora_granule_time with the theora_state of the stream.
  * This is duplicated in `vd_theora.c'; put this in a common header?
  */
-#ifdef HAVE_OGGTHEORA
+#ifdef CONFIG_OGGTHEORA
 typedef struct theora_struct_st {
     theora_state st;
     theora_comment cc;
@@ -266,7 +266,7 @@ static unsigned char* demux_ogg_read_packet(ogg_stream_t* os,ogg_packet* pack,fl
     }
   } else if (os->speex) {
     // whole packet (default)
-# ifdef HAVE_OGGTHEORA
+# ifdef CONFIG_OGGTHEORA
   } else if (os->theora) {
      /* we pass complete packets to theora, mustn't strip the header! */
      os->lastsize = 1;
@@ -292,7 +292,7 @@ static unsigned char* demux_ogg_read_packet(ogg_stream_t* os,ogg_packet* pack,fl
 	pack->granulepos = os->lastpos;
 	*pts = (double)os->lastpos / (double)os->samplerate;
      }
-#endif /* HAVE_OGGTHEORA */
+#endif /* CONFIG_OGGTHEORA */
   } else if (os->flac) {
      /* we pass complete packets to flac, mustn't strip the header! */
      if (os->flac == 2 && pack->packet[0] != 0xff)
@@ -838,7 +838,7 @@ int demux_ogg_open(demuxer_t* demuxer) {
       mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: audio (Speex), -aid %d\n",ogg_d->num_sub,n_audio-1);
 
       // check for Theora
-#   ifdef HAVE_OGGTHEORA
+#   ifdef CONFIG_OGGTHEORA
     } else if (pack.bytes >= 7 && !strncmp (&pack.packet[1], "theora", 6)) {
 	int errorCode = 0;
 	theora_info inf;
@@ -884,7 +884,7 @@ int demux_ogg_open(demuxer_t* demuxer) {
 	}
 	theora_comment_clear(&cc);
 	theora_info_clear(&inf);
-#   endif /* HAVE_OGGTHEORA */
+#   endif /* CONFIG_OGGTHEORA */
     } else if (pack.bytes >= 4 && !strncmp (&pack.packet[0], "fLaC", 4)) {
 	sh_a = new_sh_audio_aid(demuxer,ogg_d->num_sub, n_audio);
 	sh_a->format =  mmioFOURCC('f', 'L', 'a', 'C');
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 8d5eb86ab4..2b96119ca0 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -113,7 +113,7 @@ const demuxer_desc_t *const demuxer_list[] = {
 #ifdef HAVE_GIF
     &demuxer_desc_gif,
 #endif
-#ifdef HAVE_OGGVORBIS
+#ifdef CONFIG_OGGVORBIS
     &demuxer_desc_ogg,
 #endif
 #ifdef CONFIG_WIN32DLL
@@ -142,11 +142,11 @@ const demuxer_desc_t *const demuxer_list[] = {
 #ifdef MUSEPACK
     &demuxer_desc_mpc,
 #endif
-#ifdef HAVE_LIBDV095
+#ifdef CONFIG_LIBDV095
     &demuxer_desc_rawdv,
 #endif
     &demuxer_desc_aac,
-#ifdef HAVE_LIBNUT
+#ifdef CONFIG_LIBNUT
     &demuxer_desc_nut,
 #endif
 #ifdef HAVE_XMMS
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index da198f1e37..eb9503fd22 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -389,7 +389,7 @@ char* demux_info_get(demuxer_t *demuxer, const char *opt);
 int demux_info_print(demuxer_t *demuxer);
 int demux_control(demuxer_t *demuxer, int cmd, void *arg);
 
-#ifdef HAVE_OGGVORBIS
+#ifdef CONFIG_OGGVORBIS
 /* Found in demux_ogg.c */
 int demux_ogg_num_subs(demuxer_t *demuxer);
 int demux_ogg_sub_id(demuxer_t *demuxer, int index);