summaryrefslogtreecommitdiffstats
path: root/libaf/af.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-10-31 03:19:56 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:16:55 +0200
commitc5e462b33d6db445b1c763e89320b1bcb214debb (patch)
tree5091b402fb3cc768fa5dbc718d5681d3d78d191f /libaf/af.c
parent389c32b5c72897a8b1b3c929c8f278e8980f2290 (diff)
downloadmpv-c5e462b33d6db445b1c763e89320b1bcb214debb.tar.bz2
mpv-c5e462b33d6db445b1c763e89320b1bcb214debb.tar.xz
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
Diffstat (limited to 'libaf/af.c')
-rw-r--r--libaf/af.c6
1 files changed, 3 insertions, 3 deletions
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