diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2011-12-11 07:48:26 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-12-11 07:48:26 +0200 |
| commit | 2e1cdcb9e6263a7ca16151713338176ef7b1ee06 (patch) | |
| tree | f90c2ac5f9642183106114a81bfb6c979622ea1f /libaf/af.c | |
| parent | fc2d040b2248adaac816b999a90ad452ee1f2be6 (diff) | |
| download | mpv-2e1cdcb9e6263a7ca16151713338176ef7b1ee06.tar.bz2 mpv-2e1cdcb9e6263a7ca16151713338176ef7b1ee06.tar.xz | |
configure, build: remove --disable-libav support
Remove support for building the player without libavcodec and
libavformat. These libraries are now always required.
Diffstat (limited to 'libaf/af.c')
| -rw-r--r-- | libaf/af.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libaf/af.c b/libaf/af.c index 8b51eaa0d1..80f9871bfb 100644 --- a/libaf/af.c +++ b/libaf/af.c @@ -70,10 +70,8 @@ static af_info_t* filter_list[]={ #endif &af_info_volnorm, &af_info_extrastereo, -#ifdef CONFIG_FFMPEG &af_info_lavcac3enc, &af_info_lavcresample, -#endif &af_info_sweep, &af_info_hrtf, #ifdef CONFIG_LADSPA @@ -491,10 +489,8 @@ int af_init(af_stream_t* s) &(s->output.rate)); if (!af) { char *resampler = "resample"; -#ifdef CONFIG_FFMPEG if ((AF_INIT_TYPE_MASK & s->cfg.force) == AF_INIT_SLOW) resampler = "lavcresample"; -#endif if((AF_INIT_TYPE_MASK & s->cfg.force) == AF_INIT_SLOW){ if(!strcmp(s->first->info->name,"format")) af = af_append(s,s->first,resampler); @@ -515,12 +511,10 @@ 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 CONFIG_FFMPEG if (strcmp(resampler, "lavcresample") == 0) strcat(args, ":1"); else -#endif - strcat(args, ":0:0"); + strcat(args, ":0:0"); af->control(af, AF_CONTROL_COMMAND_LINE, args); } } |