From 4d9dd439abd7aced7a6583e73cef46bb7bdd96f3 Mon Sep 17 00:00:00 2001 From: reimar Date: Wed, 26 Nov 2008 18:17:55 +0000 Subject: Fix compilation after FFmpeg r15940 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28042 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 1 + 1 file changed, 1 insertion(+) (limited to 'configure') diff --git a/configure b/configure index ae6f4ceea9..91b1692a01 100755 --- a/configure +++ b/configure @@ -8078,6 +8078,7 @@ CONFIG_MDCT=yes CONFIG_ENCODERS=yes CONFIG_GPL=yes +CONFIG_AANDCT=yes CONFIG_LIBAMR=$_libamr CONFIG_LIBAMR_NB=$_libamr_nb CONFIG_LIBAMR_WB=$_libamr_wb -- cgit v1.2.3 From 189995fb63629eb10751dd15735adb9e30d37192 Mon Sep 17 00:00:00 2001 From: uau Date: Wed, 26 Nov 2008 18:49:16 +0000 Subject: configure: Move AANDCT config.mak entry and add config.h #defines Move the config.mak "CONFIG_AANDCT=yes" line to where other similar features are, and add missing CONFIG_AANDCT and ENABLE_AANDCT #defines to config.h (though current FFmpeg code works without them). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28043 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 91b1692a01..041ee87f81 100755 --- a/configure +++ b/configure @@ -8071,6 +8071,7 @@ LIBSUF=.a LIBNAME=\$(LIBPREF)\$(NAME)\$(LIBSUF) # Some FFmpeg codecs depend on these. Enable them unconditionally for now. +CONFIG_AANDCT=yes CONFIG_FFT=yes CONFIG_FFT_MMX=$fft_mmx CONFIG_GOLOMB=yes @@ -8078,7 +8079,6 @@ CONFIG_MDCT=yes CONFIG_ENCODERS=yes CONFIG_GPL=yes -CONFIG_AANDCT=yes CONFIG_LIBAMR=$_libamr CONFIG_LIBAMR_NB=$_libamr_nb CONFIG_LIBAMR_WB=$_libamr_wb @@ -8510,6 +8510,8 @@ $_def_yasm #define ENABLE_GRAY 0 /* Some FFmpeg codecs depend on these. Enable them unconditionally for now. */ +#define CONFIG_AANDCT 1 +#define ENABLE_AANDCT 1 #define CONFIG_FFT 1 #define ENABLE_FFT 1 #define CONFIG_GOLOMB 1 -- cgit v1.2.3