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 /libmpcodecs/ad.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 'libmpcodecs/ad.c')
| -rw-r--r-- | libmpcodecs/ad.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libmpcodecs/ad.c b/libmpcodecs/ad.c index 93e47b5721..fa3bbf4a46 100644 --- a/libmpcodecs/ad.c +++ b/libmpcodecs/ad.c @@ -46,15 +46,15 @@ extern const ad_functions_t mpcodecs_ad_libdca; const ad_functions_t * const mpcodecs_ad_drivers[] = { // &mpcodecs_ad_null, -#ifdef USE_MP3LIB +#ifdef CONFIG_MP3LIB &mpcodecs_ad_mp3lib, #endif -#ifdef USE_LIBA52 +#ifdef CONFIG_LIBA52 &mpcodecs_ad_liba52, &mpcodecs_ad_hwac3, #endif &mpcodecs_ad_hwmpa, -#ifdef USE_LIBAVCODEC +#ifdef CONFIG_LIBAVCODEC &mpcodecs_ad_ffmpeg, #endif &mpcodecs_ad_pcm, @@ -64,13 +64,13 @@ const ad_functions_t * const mpcodecs_ad_drivers[] = &mpcodecs_ad_msadpcm, &mpcodecs_ad_dk3adpcm, &mpcodecs_ad_msgsm, -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL &mpcodecs_ad_dshow, &mpcodecs_ad_dmo, &mpcodecs_ad_acm, &mpcodecs_ad_twin, #endif -#ifdef USE_QTX_CODECS +#ifdef CONFIG_QTX_CODECS &mpcodecs_ad_qtaudio, #endif #ifdef HAVE_FAAD @@ -82,10 +82,10 @@ const ad_functions_t * const mpcodecs_ad_drivers[] = #ifdef HAVE_SPEEX &mpcodecs_ad_speex, #endif -#ifdef USE_LIBMAD +#ifdef CONFIG_LIBMAD &mpcodecs_ad_libmad, #endif -#ifdef USE_REALCODECS +#ifdef CONFIG_REALCODECS &mpcodecs_ad_realaud, #endif #ifdef HAVE_LIBDV095 @@ -94,7 +94,7 @@ const ad_functions_t * const mpcodecs_ad_drivers[] = #ifdef HAVE_MUSEPACK &mpcodecs_ad_libmusepack, #endif -#ifdef USE_LIBDCA +#ifdef CONFIG_LIBDCA &mpcodecs_ad_libdca, #endif NULL |