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/ae.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/ae.c')
| -rw-r--r-- | libmpcodecs/ae.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/ae.c b/libmpcodecs/ae.c index c8b3dd526a..f671f294dc 100644 --- a/libmpcodecs/ae.c +++ b/libmpcodecs/ae.c @@ -22,7 +22,7 @@ #include "ae_lame.h" #endif -#ifdef USE_LIBAVCODEC +#ifdef CONFIG_LIBAVCODEC #include "ae_lavc.h" #endif @@ -55,7 +55,7 @@ audio_encoder_t *new_audio_encoder(muxer_stream_t *stream, audio_encoding_params ris = mpae_init_toolame(encoder); break; #endif -#ifdef USE_LIBAVCODEC +#ifdef CONFIG_LIBAVCODEC case ACODEC_LAVC: ris = mpae_init_lavc(encoder); break; |