diff options
| author |  Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-28 04:12:18 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-28 04:12:18 +0200 |
| commit | 479f5e742f22d46430fa265adfa9162f4e2ab865 (patch) | |
| tree | 8450cfd34feb5b81d604101ad9ebfc7b24c1d88e /configure | |
| parent | 0d7f9f033cdd677df3b85aca45491955b87a1abc (diff) | |
| parent | 97293969b40797442ec0f612b89a89ace8804561 (diff) | |
Merge svn changes up to r27841
Conflicts:
mplayer.c
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -7984,12 +7984,12 @@ LIBPREF=lib LIBSUF=.a LIBNAME=\$(LIBPREF)\$(NAME)\$(LIBSUF) -CONFIG_ENCODERS=yes # Some FFmpeg codecs depend on these. Enable them unconditionally for now. CONFIG_FFT=yes -CONFIG_MDCT=yes CONFIG_GOLOMB=yes +CONFIG_MDCT=yes +CONFIG_ENCODERS=yes CONFIG_GPL=yes CONFIG_LIBAMR=$_libamr CONFIG_LIBAMR_NB=$_libamr_nb @@ -8421,10 +8421,10 @@ $_def_threads /* Some FFmpeg codecs depend on these. Enable them unconditionally for now. */ #define CONFIG_FFT 1 #define ENABLE_FFT 1 -#define CONFIG_MDCT 1 -#define ENABLE_MDCT 1 #define CONFIG_GOLOMB 1 #define ENABLE_GOLOMB 1 +#define CONFIG_MDCT 1 +#define ENABLE_MDCT 1 /* Use these registers in FFmpeg x86 inline asm. No proper detection yet. */ #define HAVE_EBX_AVAILABLE 1 |