From d17f9943af8aeeca65b327ad22475b4df36a3b2d Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 1 Aug 2008 20:28:58 +0000 Subject: 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 --- libmpdemux/demux_ogg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libmpdemux/demux_ogg.c') diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index 989542df0f..761d332e75 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -196,7 +196,7 @@ void demux_ogg_add_sub (ogg_stream_t* os,ogg_packet* pack) { mp_msg(MSGT_DEMUX,MSGL_DBG2,"Ogg sub lines: %d first: '%s'\n", ogg_sub.lines, ogg_sub.text[0]); -#ifdef CONFIG_ICONV +#ifdef HAVE_ICONV subcp_recode(&ogg_sub); #endif vo_sub = &ogg_sub; @@ -745,7 +745,7 @@ int demux_ogg_open(demuxer_t* demuxer) { sh_audio_t* sh_a; sh_video_t* sh_v; -#ifdef CONFIG_ICONV +#ifdef HAVE_ICONV subcp_open(NULL); #endif @@ -1486,7 +1486,7 @@ static void demux_close_ogg(demuxer_t* demuxer) { if(!ogg_d) return; -#ifdef CONFIG_ICONV +#ifdef HAVE_ICONV subcp_close(); #endif -- cgit v1.2.3 From 96a506733dbb62b0fdfc29d46d49f03e0057c53b Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 2 Aug 2008 16:30:32 +0000 Subject: 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 --- libmpdemux/demux_ogg.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libmpdemux/demux_ogg.c') 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 #endif -#ifdef HAVE_OGGTHEORA +#ifdef CONFIG_OGGTHEORA #include 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'); -- cgit v1.2.3