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 /libaf | |
| 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 'libaf')
| -rw-r--r-- | libaf/af.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libaf/af.c b/libaf/af.c index 1fcda9b004..de84807875 100644 --- a/libaf/af.c +++ b/libaf/af.c @@ -52,10 +52,10 @@ static af_info_t* filter_list[]={ #endif &af_info_volnorm, &af_info_extrastereo, -#ifdef USE_LIBAVCODEC_A +#ifdef CONFIG_LIBAVCODEC_A &af_info_lavcac3enc, #endif -#ifdef USE_LIBAVCODEC +#ifdef CONFIG_LIBAVCODEC &af_info_lavcresample, #endif &af_info_sweep, @@ -399,7 +399,7 @@ int af_init(af_stream_t* s) &(s->output.rate)); if (!af) { char *resampler = "resample"; -#ifdef USE_LIBAVCODEC +#ifdef CONFIG_LIBAVCODEC if ((AF_INIT_TYPE_MASK & s->cfg.force) == AF_INIT_SLOW) resampler = "lavcresample"; #endif @@ -423,7 +423,7 @@ int af_init(af_stream_t* s) if ((AF_INIT_TYPE_MASK & s->cfg.force) == AF_INIT_FAST) { char args[32]; sprintf(args, "%d", s->output.rate); -#ifdef USE_LIBAVCODEC +#ifdef CONFIG_LIBAVCODEC if (strcmp(resampler, "lavcresample") == 0) strcat(args, ":1"); else |