From c5e462b33d6db445b1c763e89320b1bcb214debb Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Sun, 31 Oct 2010 03:19:56 +0300 Subject: build: enable/disable all FFmpeg libraries together Enable all of libavcodec, libavformat, libswscale, and libpostproc together (libavutil is always required). based on svn commit by diego: git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32226 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libaf/af.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libaf/af.c') diff --git a/libaf/af.c b/libaf/af.c index f8dde983e0..a0462c0cfb 100644 --- a/libaf/af.c +++ b/libaf/af.c @@ -70,7 +70,7 @@ static af_info_t* filter_list[]={ #endif &af_info_volnorm, &af_info_extrastereo, -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG &af_info_lavcac3enc, &af_info_lavcresample, #endif @@ -468,7 +468,7 @@ int af_init(af_stream_t* s) &(s->output.rate)); if (!af) { char *resampler = "resample"; -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG if ((AF_INIT_TYPE_MASK & s->cfg.force) == AF_INIT_SLOW) resampler = "lavcresample"; #endif @@ -492,7 +492,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 CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG if (strcmp(resampler, "lavcresample") == 0) strcat(args, ":1"); else -- cgit v1.2.3