diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-07 12:20:50 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-07 12:20:50 +0000 |
commit | e0b1c9a6b772683af9cb2a4f555cec1c5aa56afb (patch) | |
tree | cfbb85cfa216f0e80749850c4829308ce024d93f /libmpcodecs | |
parent | 7377a6a60aad8e52fde392bbb42a41cf96937abe (diff) | |
download | mpv-e0b1c9a6b772683af9cb2a4f555cec1c5aa56afb.tar.bz2 mpv-e0b1c9a6b772683af9cb2a4f555cec1c5aa56afb.tar.xz |
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
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/ad_libvorbis.c | 18 | ||||
-rw-r--r-- | libmpcodecs/dec_audio.c | 6 | ||||
-rw-r--r-- | libmpcodecs/dec_video.c | 6 |
3 files changed, 15 insertions, 15 deletions
diff --git a/libmpcodecs/ad_libvorbis.c b/libmpcodecs/ad_libvorbis.c index f693d662cf..dd20c34984 100644 --- a/libmpcodecs/ad_libvorbis.c +++ b/libmpcodecs/ad_libvorbis.c @@ -20,7 +20,7 @@ static ad_info_t info = LIBAD_EXTERN(libvorbis) -#ifdef TREMOR +#ifdef CONFIG_TREMOR #include <tremor/ivorbiscodec.h> #else #include <vorbis/codec.h> @@ -34,7 +34,7 @@ typedef struct ov_struct_st { vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */ vorbis_block vb; /* local working space for packet->PCM decode */ float rg_scale; /* replaygain scale */ -#ifdef TREMOR +#ifdef CONFIG_TREMOR int rg_scale_int; #endif } ov_struct_t; @@ -160,7 +160,7 @@ static int init(sh_audio_t *sh) /* replaygain: security */ if(ov->rg_scale > 15.) ov->rg_scale = 15.; -#ifdef TREMOR +#ifdef CONFIG_TREMOR ov->rg_scale_int = (int)(ov->rg_scale*64.f); #endif mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbis: Bitstream is %d channel%s, %dHz, %dbit/s %cBR\n",(int)ov->vi.channels,ov->vi.channels>1?"s":"",(int)ov->vi.rate,(int)ov->vi.bitrate_nominal, @@ -218,7 +218,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen) { int len = 0; int samples; -#ifdef TREMOR +#ifdef CONFIG_TREMOR ogg_int32_t **pcm; #else float scale; @@ -250,7 +250,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen) /* convert floats to 16 bit signed ints (host order) and interleave */ -#ifdef TREMOR +#ifdef CONFIG_TREMOR if (ov->rg_scale_int == 64) { for(i=0;i<ov->vi.channels;i++){ ogg_int16_t *convbuffer=(ogg_int16_t *)(&buf[len]); @@ -272,15 +272,15 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen) } } } else -#endif /* TREMOR */ +#endif /* CONFIG_TREMOR */ { -#ifndef TREMOR +#ifndef CONFIG_TREMOR scale = 32767.f * ov->rg_scale; #endif for(i=0;i<ov->vi.channels;i++){ ogg_int16_t *convbuffer=(ogg_int16_t *)(&buf[len]); ogg_int16_t *ptr=convbuffer+i; -#ifdef TREMOR +#ifdef CONFIG_TREMOR ogg_int32_t *mono=pcm[i]; for(j=0;j<bout;j++){ int val=(mono[j]*ov->rg_scale_int)>>(9+6); @@ -297,7 +297,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen) val=-32768; clipflag=1; } -#endif /* TREMOR */ +#endif /* CONFIG_TREMOR */ *ptr=val; ptr+=ov->vi.channels; } diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c index 28dc529318..23f19ac405 100644 --- a/libmpcodecs/dec_audio.c +++ b/libmpcodecs/dec_audio.c @@ -23,7 +23,7 @@ #include <malloc.h> #endif -#ifdef DYNAMIC_PLUGINS +#ifdef CONFIG_DYNAMIC_PLUGINS #include <dlfcn.h> #endif @@ -167,7 +167,7 @@ static int init_audio(sh_audio_t *sh_audio, char *codecname, char *afm, sh_audio->codec->drv)) break; mpadec = mpcodecs_ad_drivers[i]; -#ifdef DYNAMIC_PLUGINS +#ifdef CONFIG_DYNAMIC_PLUGINS if (!mpadec) { /* try to open shared decoder plugin */ int buf_len; @@ -297,7 +297,7 @@ void uninit_audio(sh_audio_t *sh_audio) mp_msg(MSGT_DECAUDIO, MSGL_V, MSGTR_UninitAudioStr, sh_audio->codec->drv); sh_audio->ad_driver->uninit(sh_audio); -#ifdef DYNAMIC_PLUGINS +#ifdef CONFIG_DYNAMIC_PLUGINS if (sh_audio->dec_handle) dlclose(sh_audio->dec_handle); #endif diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c index bfb2203dcd..0a76fc06bb 100644 --- a/libmpcodecs/dec_video.c +++ b/libmpcodecs/dec_video.c @@ -28,7 +28,7 @@ #include "dec_video.h" -#ifdef DYNAMIC_PLUGINS +#ifdef CONFIG_DYNAMIC_PLUGINS #include <dlfcn.h> #endif @@ -155,7 +155,7 @@ void uninit_video(sh_video_t *sh_video){ if(!sh_video->initialized) return; mp_msg(MSGT_DECVIDEO,MSGL_V,MSGTR_UninitVideoStr,sh_video->codec->drv); mpvdec->uninit(sh_video); -#ifdef DYNAMIC_PLUGINS +#ifdef CONFIG_DYNAMIC_PLUGINS if (sh_video->dec_handle) dlclose(sh_video->dec_handle); #endif @@ -205,7 +205,7 @@ static int init_video(sh_video_t *sh_video,char* codecname,char* vfm,int status, // if(mpcodecs_vd_drivers[i]->info->id==sh_video->codec->driver) break; if(!strcmp(mpcodecs_vd_drivers[i]->info->short_name,sh_video->codec->drv)) break; mpvdec=mpcodecs_vd_drivers[i]; -#ifdef DYNAMIC_PLUGINS +#ifdef CONFIG_DYNAMIC_PLUGINS if (!mpvdec) { /* try to open shared decoder plugin */ |