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/ae.c | |
| parent | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (diff) | |
| parent | ded7033671fb7d84fbdb67ace46c1fc8833631bc (diff) | |
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/ae.c')
| -rw-r--r-- | libmpcodecs/ae.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libmpcodecs/ae.c b/libmpcodecs/ae.c index f671f294dc..5e7b76b4e9 100644 --- a/libmpcodecs/ae.c +++ b/libmpcodecs/ae.c @@ -14,11 +14,11 @@ #include "ae_pcm.h" -#ifdef HAVE_TOOLAME +#ifdef CONFIG_TOOLAME #include "ae_toolame.h" #endif -#ifdef HAVE_MP3LAME +#ifdef CONFIG_MP3LAME #include "ae_lame.h" #endif @@ -26,11 +26,11 @@ #include "ae_lavc.h" #endif -#ifdef HAVE_FAAC +#ifdef CONFIG_FAAC #include "ae_faac.h" #endif -#ifdef HAVE_TWOLAME +#ifdef CONFIG_TWOLAME #include "ae_twolame.h" #endif @@ -50,7 +50,7 @@ audio_encoder_t *new_audio_encoder(muxer_stream_t *stream, audio_encoding_params case ACODEC_PCM: ris = mpae_init_pcm(encoder); break; -#ifdef HAVE_TOOLAME +#ifdef CONFIG_TOOLAME case ACODEC_TOOLAME: ris = mpae_init_toolame(encoder); break; @@ -60,17 +60,17 @@ audio_encoder_t *new_audio_encoder(muxer_stream_t *stream, audio_encoding_params ris = mpae_init_lavc(encoder); break; #endif -#ifdef HAVE_MP3LAME +#ifdef CONFIG_MP3LAME case ACODEC_VBRMP3: ris = mpae_init_lame(encoder); break; #endif -#ifdef HAVE_FAAC +#ifdef CONFIG_FAAC case ACODEC_FAAC: ris = mpae_init_faac(encoder); break; #endif -#ifdef HAVE_TWOLAME +#ifdef CONFIG_TWOLAME case ACODEC_TWOLAME: ris = mpae_init_twolame(encoder); break; |