summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2008-10-26 04:24:47 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2008-10-26 04:24:47 +0200
commit0d7f9f033cdd677df3b85aca45491955b87a1abc (patch)
tree402bf52da86cb6261dcfa046bf27d0c5f4bf4fc7 /configure
parent4db39fdfdb9caeb91ed7fbd87174faa49f8baeda (diff)
parent8bfdce3a8350a7e7f54fcdecc612ecc0d9a544a9 (diff)
downloadmpv-0d7f9f033cdd677df3b85aca45491955b87a1abc.tar.bz2
mpv-0d7f9f033cdd677df3b85aca45491955b87a1abc.tar.xz
Merge svn changes up to r27828
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure11
1 files changed, 9 insertions, 2 deletions
diff --git a/configure b/configure
index 29673d1ce4..43c7325746 100755
--- a/configure
+++ b/configure
@@ -7985,8 +7985,11 @@ LIBSUF=.a
LIBNAME=\$(LIBPREF)\$(NAME)\$(LIBSUF)
CONFIG_ENCODERS=yes
-# Some FFmpeg codecs depend on this. Enable it unconditionally for now.
+# Some FFmpeg codecs depend on these. Enable them unconditionally for now.
CONFIG_FFT=yes
+CONFIG_MDCT=yes
+CONFIG_GOLOMB=yes
+
CONFIG_GPL=yes
CONFIG_LIBAMR=$_libamr
CONFIG_LIBAMR_NB=$_libamr_nb
@@ -8415,9 +8418,13 @@ $_def_threads
#define ENABLE_SMALL 0
#define ENABLE_GRAY 0
-/* Some FFmpeg codecs depend on this. Enable it unconditionally for now. */
+/* 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
/* Use these registers in FFmpeg x86 inline asm. No proper detection yet. */
#define HAVE_EBX_AVAILABLE 1