diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
| commit | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (patch) | |
| tree | b09b4c45898be2754f156ebba16fa1054f42788d /mp3lib/sr1.c | |
| parent | 3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d (diff) | |
| parent | 1fdf02e6fbd896c8fcce03992ecdf36144d85714 (diff) | |
| download | mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.bz2 mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.xz | |
Merge svn changes up to r27374
Conflicts:
cfg-common-opts.h
cfg-mplayer.h
command.c
configure
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpcodecs/vf_vo.c
libmpdemux/demuxer.h
libmpdemux/stheader.h
mp_core.h
mplayer.c
stream/stream_radio.c
Diffstat (limited to 'mp3lib/sr1.c')
| -rw-r--r-- | mp3lib/sr1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c index 2cadb020bc..65a749ed10 100644 --- a/mp3lib/sr1.c +++ b/mp3lib/sr1.c @@ -400,7 +400,7 @@ void (*dct64_MMX_func)(short *, short *, real *); #include "cpudetect.h" // Init decoder tables. Call first, once! -#ifdef USE_FAKE_MONO +#ifdef CONFIG_FAKE_MONO void MP3_Init(int fakemono){ #else void MP3_Init(){ @@ -475,7 +475,7 @@ void MP3_Init(){ mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using generic C decore!\n"); } -#ifdef USE_FAKE_MONO +#ifdef CONFIG_FAKE_MONO if (fakemono == 1) fr.synth=synth_1to1_l; else if (fakemono == 2) |