diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-02 22:04:35 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-02 22:04:35 +0300 |
| commit | 6cce822505c0a76ac520909a895021b8f5b7e5ab (patch) | |
| tree | f8ba954c698470208a243be3da216f7f54367f46 /libmpcodecs/ad.c | |
| parent | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (diff) | |
| parent | ded7033671fb7d84fbdb67ace46c1fc8833631bc (diff) | |
| download | mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.bz2 mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.xz | |
Merge svn changes up to r27399
Conflicts:
libmpcodecs/vd.c
libmpcodecs/ve_raw.c
libvo/video_out.c
libvo/x11_common.c
mplayer.c
Diffstat (limited to 'libmpcodecs/ad.c')
| -rw-r--r-- | libmpcodecs/ad.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmpcodecs/ad.c b/libmpcodecs/ad.c index fa3bbf4a46..3f191826fa 100644 --- a/libmpcodecs/ad.c +++ b/libmpcodecs/ad.c @@ -73,13 +73,13 @@ const ad_functions_t * const mpcodecs_ad_drivers[] = #ifdef CONFIG_QTX_CODECS &mpcodecs_ad_qtaudio, #endif -#ifdef HAVE_FAAD +#ifdef CONFIG_FAAD &mpcodecs_ad_faad, #endif -#ifdef HAVE_OGGVORBIS +#ifdef CONFIG_OGGVORBIS &mpcodecs_ad_libvorbis, #endif -#ifdef HAVE_SPEEX +#ifdef CONFIG_SPEEX &mpcodecs_ad_speex, #endif #ifdef CONFIG_LIBMAD @@ -88,10 +88,10 @@ const ad_functions_t * const mpcodecs_ad_drivers[] = #ifdef CONFIG_REALCODECS &mpcodecs_ad_realaud, #endif -#ifdef HAVE_LIBDV095 +#ifdef CONFIG_LIBDV095 &mpcodecs_ad_libdv, #endif -#ifdef HAVE_MUSEPACK +#ifdef CONFIG_MUSEPACK &mpcodecs_ad_libmusepack, #endif #ifdef CONFIG_LIBDCA |