From 02135001b44afc5446228228055c9ce7f29df5be Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 3 Aug 2008 15:21:40 +0000 Subject: Change a bunch of video/audio-output-specific preprocessor directives from a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demuxer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmpdemux') diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index eb9503fd22..edd13c404f 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -12,7 +12,7 @@ #endif #define MAX_PACKS 4096 -#ifdef HAVE_TV_BSDBT848 +#ifdef CONFIG_TV_BSDBT848 #define MAX_PACK_BYTES 0x2000000 #else #define MAX_PACK_BYTES 0x800000 -- cgit v1.2.3 From 0a749ffdc5ecaf1d34d53dfc8e12c6c3be121758 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 5 Aug 2008 08:47:51 +0000 Subject: Rename preprocessor directives related to image libraries. Change a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27417 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_gif.c | 4 ++-- libmpdemux/demuxer.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'libmpdemux') diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c index 99135db0c8..99aa134d92 100644 --- a/libmpdemux/demux_gif.c +++ b/libmpdemux/demux_gif.c @@ -29,7 +29,7 @@ typedef struct { #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F') -#ifndef HAVE_GIF_TVT_HACK +#ifndef CONFIG_GIF_TVT_HACK // not supported by certain versions of the library int my_read_gif(GifFileType *gif, uint8_t *buf, int len) { return stream_read(gif->UserData, buf, len); @@ -230,7 +230,7 @@ static demuxer_t* demux_open_gif(demuxer_t* demuxer) // go back to the beginning stream_seek(demuxer->stream,demuxer->stream->start_pos); -#ifdef HAVE_GIF_TVT_HACK +#ifdef CONFIG_GIF_TVT_HACK // without the TVT functionality of libungif, a hard seek must be // done to the beginning of the file. this is because libgif is // unable to use mplayer's cache, and without this lseek libgif will diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 2b96119ca0..b9220ccc3e 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -110,7 +110,7 @@ const demuxer_desc_t *const demuxer_list[] = { &demuxer_desc_fli, &demuxer_desc_film, &demuxer_desc_roq, -#ifdef HAVE_GIF +#ifdef CONFIG_GIF &demuxer_desc_gif, #endif #ifdef CONFIG_OGGVORBIS -- cgit v1.2.3 From 473e2824cba09c93e9afb40a127ad5f07704c7ae Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 6 Aug 2008 07:42:26 +0000 Subject: Rename all preprocessor directives related to Apple / Mac OS X. Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27420 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmpdemux') diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index 2e6d5fc4c0..1164167140 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -25,7 +25,7 @@ #include "config.h" -#ifdef HAVE_QUICKTIME +#ifdef CONFIG_QUICKTIME #include #include #include -- cgit v1.2.3 From 141e81cce4fb780a1e2f791c79c1664956401af7 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 7 Aug 2008 08:58:07 +0000 Subject: Rename a bunch of miscellaneous preprocessor directives. Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27423 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demuxer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmpdemux') diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index b9220ccc3e..862a0e4310 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -149,7 +149,7 @@ const demuxer_desc_t *const demuxer_list[] = { #ifdef CONFIG_LIBNUT &demuxer_desc_nut, #endif -#ifdef HAVE_XMMS +#ifdef CONFIG_XMMS &demuxer_desc_xmms, #endif /* Please do not add any new demuxers here. If you want to implement a new -- cgit v1.2.3 From 091d352d065442817aa05c2f61910366004405be Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 7 Aug 2008 10:36:07 +0000 Subject: Rename font-related preprocessor directives. Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_ogg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libmpdemux') diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index 3c5a38bf82..e3480a4e59 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 HAVE_ICONV +#ifdef CONFIG_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 HAVE_ICONV +#ifdef CONFIG_ICONV subcp_open(NULL); #endif @@ -1486,7 +1486,7 @@ static void demux_close_ogg(demuxer_t* demuxer) { if(!ogg_d) return; -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV subcp_close(); #endif -- cgit v1.2.3 From e98e792843a2fc6f4cec00803a4efa7a71eab7b3 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 7 Aug 2008 11:19:54 +0000 Subject: 10l: MUSEPACK --> CONFIG_MUSEPACK git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27427 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demuxer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmpdemux') diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 862a0e4310..a330a427aa 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -139,7 +139,7 @@ const demuxer_desc_t *const demuxer_list[] = { #ifdef CONFIG_LIBAVFORMAT &demuxer_desc_lavf, #endif -#ifdef MUSEPACK +#ifdef CONFIG_MUSEPACK &demuxer_desc_mpc, #endif #ifdef CONFIG_LIBDV095 -- cgit v1.2.3 From e0b1c9a6b772683af9cb2a4f555cec1c5aa56afb Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 7 Aug 2008 12:20:50 +0000 Subject: Give a CONFIG_ prefix to preprocessor directives that lacked one and change arbitrary prefixes to CONFIG_. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/asfheader.c | 2 +- libmpdemux/demux_ogg.c | 2 +- libmpdemux/demuxer.c | 4 ++-- libmpdemux/stheader.h | 4 ++-- libmpdemux/video.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'libmpdemux') diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c index 0228dc87f9..93bd1354a9 100644 --- a/libmpdemux/asfheader.c +++ b/libmpdemux/asfheader.c @@ -639,7 +639,7 @@ if(streams) { // as the servers often do not care about what we requested. #if 0 uint32_t vr = 0, ar = 0,i; -#ifdef MPLAYER_NETWORK +#ifdef CONFIG_NETWORK if( demuxer->stream->streaming_ctrl!=NULL ) { if( demuxer->stream->streaming_ctrl->bandwidth!=0 && demuxer->stream->streaming_ctrl->data!=NULL ) { best_audio = ((asf_http_streaming_ctrl_t*)demuxer->stream->streaming_ctrl->data)->audio_id; diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index e3480a4e59..14bd180532 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -19,7 +19,7 @@ #define FOURCC_SPEEX mmioFOURCC('s', 'p', 'x', ' ') #define FOURCC_THEORA mmioFOURCC('t', 'h', 'e', 'o') -#ifdef TREMOR +#ifdef CONFIG_TREMOR #include #include #else diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index a330a427aa..20130332fd 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -130,10 +130,10 @@ const demuxer_desc_t *const demuxer_list[] = { &demuxer_desc_h264_es, &demuxer_desc_audio, &demuxer_desc_mpeg_ty, -#ifdef STREAMING_LIVE555 +#ifdef CONFIG_LIVE555 &demuxer_desc_rtp, #endif -#ifdef LIBNEMESI +#ifdef CONFIG_LIBNEMESI &demuxer_desc_rtp_nemesi, #endif #ifdef CONFIG_LIBAVFORMAT diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index defdf7e986..4f2266be8b 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -38,7 +38,7 @@ typedef struct { // void* audio_out; // the audio_out handle, used for this audio stream struct af_stream_s *afilter; // the audio filter stream struct ad_functions_s* ad_driver; -#ifdef DYNAMIC_PLUGINS +#ifdef CONFIG_DYNAMIC_PLUGINS void *dec_handle; #endif // win32-compatible codec parameters: @@ -83,7 +83,7 @@ typedef struct { unsigned int outfmtidx; struct vf_instance_s *vfilter; // the video filter chain, used for this video stream int vf_initialized; -#ifdef DYNAMIC_PLUGINS +#ifdef CONFIG_DYNAMIC_PLUGINS void *dec_handle; #endif // win32-compatible codec parameters: diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 95348a8efa..0e7dfe618c 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -25,7 +25,7 @@ /* biCompression constant */ #define BI_RGB 0L -#ifdef STREAMING_LIVE555 +#ifdef CONFIG_LIVE555 #include "demux_rtp.h" #endif @@ -57,7 +57,7 @@ static video_codec_t find_video_codec(sh_video_t *sh_video) ((! sh_video->format) || (sh_video->format==0x10000001) || (sh_video->format==0x10000002)) ) || (fmt == DEMUXER_TYPE_MPEG_TY) -#ifdef STREAMING_LIVE555 +#ifdef CONFIG_LIVE555 || ((fmt == DEMUXER_TYPE_RTP) && demux_is_mpeg_rtp_stream(d_video->demuxer)) #endif ) -- cgit v1.2.3