10l: Revert previous commit about CONFIG_HARDCODED_TABLES/CONFIG_MPEGAUDIO_HP.

These two variables are handled different from others in libavcodec/Makefile,
thus the previous way of adding them to config.mak was correct.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30553 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2010-02-13 16:59:42 +00:00
parent 24959bb3b4
commit 134e9685a2
1 changed files with 5 additions and 3 deletions

8
configure vendored
View File

@ -3528,6 +3528,7 @@ echores "$_fastmemcpy"
echocheck "hard-coded tables"
if test "$hardcoded_tables" = yes ; then
def_hardcoded_tables='#define CONFIG_HARDCODED_TABLES 1'
mak_hardcoded_tables='CONFIG_HARDCODED_TABLES = yes'
else
def_hardcoded_tables='#define CONFIG_HARDCODED_TABLES 0'
fi
@ -7309,7 +7310,8 @@ test "$_libavcodec" = yes && def_libavcodec='#define CONFIG_LIBAVCODEC 1'
test "$_libavcodec_a" = yes && def_libavcodec_a='#define CONFIG_LIBAVCODEC_A 1'
test "$_libavcodec_so" = yes && def_libavcodec_so='#define CONFIG_LIBAVCODEC_SO 1'
test "$_libavcodec_mpegaudio_hp" = yes \
&& def_libavcodec_mpegaudio_hp='#define CONFIG_MPEGAUDIO_HP 1'
&& def_libavcodec_mpegaudio_hp='#define CONFIG_MPEGAUDIO_HP 1' \
&& mak_libavcodec_mpegaudio_hp='CONFIG_MPEGAUDIO_HP = yes'
if test "$_libavcodec_a" = yes ; then
_codecmodules="libavcodec(internal) $_codecmodules"
elif test "$_libavcodec_so" = yes ; then
@ -8582,6 +8584,8 @@ FAAC=$_faac
FAAD = $_faad
FAAD_INTERNAL = $_faad_internal
FASTMEMCPY = $_fastmemcpy
$mak_hardcoded_tables
$mak_libavcodec_mpegaudio_hp
FBDEV = $_fbdev
FREETYPE = $_freetype
FTP = $_ftp
@ -8751,7 +8755,6 @@ CONFIG_RDFT=yes
CONFIG_BZLIB=$bzlib
CONFIG_ENCODERS=yes
CONFIG_GPL=yes
CONFIG_HARDCODED_TABLES=$hardcoded_tables
CONFIG_LIBDIRAC_DECODER=$_libdirac_lavc
CONFIG_LIBDIRAC_ENCODER=$_libdirac_lavc
CONFIG_LIBFAAC_ENCODER=$_faac_lavc
@ -8767,7 +8770,6 @@ CONFIG_LIBVORBIS_ENCODER=$_libvorbis
CONFIG_LIBX264_ENCODER=$_x264_lavc
CONFIG_LIBXVID_ENCODER=$_xvid_lavc
CONFIG_MLIB = $_mlib
CONFIG_MPEGAUDIO_HP = $_libavcodec_mpegaudio_hp
CONFIG_MUXERS=$_mencoder
CONFIG_POSTPROC = yes
# Prevent building libavcodec/imgresample.c with conflicting symbols