Mercurial > mplayer.hg

changeset 30916:c9e9b7abdb20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move some FFmpeg-specific entries to the FFmpeg section of config.mak.
author diego
date Thu, 25 Mar 2010 18:51:57 +0000
parents 8b78430a1249
children 4ccce86f5c96
files configure
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Thu Mar 25 12:58:41 2010 +0000
+++ b/configure	Thu Mar 25 18:51:57 2010 +0000
@@ -8446,10 +8446,8 @@
 CC = $_cc
 CXX = $_cc
 HOST_CC = $_host_cc
-YASM = $_yasm
 INSTALL = $_install
 INSTALLSTRIP = $_install_strip
-RANLIB = $_ranlib
 WINDRES = $_windres
 
 CFLAGS = $CFLAGS $extra_cflags
@@ -8465,7 +8463,6 @@
 CFLAGS_STACKREALIGN = $cflags_stackrealign
 CFLAGS_SVGALIB_HELPER = $cflags_svgalib_helper
 CFLAGS_TREMOR_LOW = $cflags_tremor_low
-YASMFLAGS = $YASMFLAGS
 
 EXTRALIBS = $extra_ldflags $_ld_static $_ld_lm $extra_libs
 EXTRALIBS_MPLAYER = $libs_mplayer
@@ -8535,8 +8532,6 @@
 FAAD = $_faad
 FAAD_INTERNAL = $_faad_internal
 FASTMEMCPY = $_fastmemcpy
-$mak_hardcoded_tables
-$mak_libavcodec_mpegaudio_hp
 FBDEV = $_fbdev
 FREETYPE = $_freetype
 FTP = $_ftp
@@ -8685,6 +8680,10 @@
 HOSTLIBS=-lm
 CC_O=-o \$@
 LD=gcc
+RANLIB = $_ranlib
+YASM = $_yasm
+YASMFLAGS = $YASMFLAGS
+
 CONFIG_STATIC=yes
 SRC_PATH=..
 BUILD_ROOT=..
@@ -8705,6 +8704,9 @@
 CONFIG_MDCT=yes
 CONFIG_RDFT=yes
 
+$mak_hardcoded_tables
+$mak_libavcodec_mpegaudio_hp
+
 CONFIG_BZLIB=$bzlib
 CONFIG_ENCODERS=yes
 CONFIG_GPL=yes