Mercurial > mplayer.hg

comparison configure @ 30227:052c823850f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
FFmpeg uses ifdef in Makefiles for CONFIG_MPEGAUDIO_HP and CONFIG_HARDCODED_TABLES. Change the config.mak generation to take that into account and not generate a definition for these if the features are disabled.
author reimar
date Sun, 10 Jan 2010 20:32:19 +0000
parents 4588d468fa98
children 522c5ef11d6a
comparison
equal deleted inserted replaced
30226:cf58d8f46d98 30227:052c823850f0
3349 3349
3350 3350
3351 echocheck "hard-coded tables" 3351 echocheck "hard-coded tables"
3352 if test "$hardcoded_tables" = yes ; then 3352 if test "$hardcoded_tables" = yes ; then
3353 def_hardcoded_tables='#define CONFIG_HARDCODED_TABLES 1' 3353 def_hardcoded_tables='#define CONFIG_HARDCODED_TABLES 1'
3354 mak_hardcoded_tables='CONFIG_HARDCODED_TABLES = yes'
3354 else 3355 else
3355 def_hardcoded_tables='#define CONFIG_HARDCODED_TABLES 0' 3356 def_hardcoded_tables='#define CONFIG_HARDCODED_TABLES 0'
3356 fi 3357 fi
3357 echores "$hardcoded_tables" 3358 echores "$hardcoded_tables"
3358 3359
7110 test "$_libavcodec_a" = yes || test "$_libavcodec_so" = yes && _libavcodec=yes 7111 test "$_libavcodec_a" = yes || test "$_libavcodec_so" = yes && _libavcodec=yes
7111 test "$_libavcodec" = yes && def_libavcodec='#define CONFIG_LIBAVCODEC 1' 7112 test "$_libavcodec" = yes && def_libavcodec='#define CONFIG_LIBAVCODEC 1'
7112 test "$_libavcodec_a" = yes && def_libavcodec_a='#define CONFIG_LIBAVCODEC_A 1' 7113 test "$_libavcodec_a" = yes && def_libavcodec_a='#define CONFIG_LIBAVCODEC_A 1'
7113 test "$_libavcodec_so" = yes && def_libavcodec_so='#define CONFIG_LIBAVCODEC_SO 1' 7114 test "$_libavcodec_so" = yes && def_libavcodec_so='#define CONFIG_LIBAVCODEC_SO 1'
7114 test "$_libavcodec_mpegaudio_hp" = yes \ 7115 test "$_libavcodec_mpegaudio_hp" = yes \
7115 && def_libavcodec_mpegaudio_hp='#define CONFIG_MPEGAUDIO_HP 1' 7116 && def_libavcodec_mpegaudio_hp='#define CONFIG_MPEGAUDIO_HP 1' \
7117 && mak_libavcodec_mpegaudio_hp='CONFIG_MPEGAUDIO_HP = yes'
7116 if test "$_libavcodec_a" = yes ; then 7118 if test "$_libavcodec_a" = yes ; then
7117 _codecmodules="libavcodec(internal) $_codecmodules" 7119 _codecmodules="libavcodec(internal) $_codecmodules"
7118 elif test "$_libavcodec_so" = yes ; then 7120 elif test "$_libavcodec_so" = yes ; then
7119 _codecmodules="libavcodec.so $_codecmodules" 7121 _codecmodules="libavcodec.so $_codecmodules"
7120 else 7122 else
8374 ESD = $_esd 8376 ESD = $_esd
8375 FAAC=$_faac 8377 FAAC=$_faac
8376 FAAD = $_faad 8378 FAAD = $_faad
8377 FAAD_INTERNAL = $_faad_internal 8379 FAAD_INTERNAL = $_faad_internal
8378 FASTMEMCPY = $_fastmemcpy 8380 FASTMEMCPY = $_fastmemcpy
8379 CONFIG_HARDCODED_TABLES = $hardcoded_tables 8381 $mak_hardcoded_tables
8382 $mak_libavcodec_mpegaudio_hp
8380 FBDEV = $_fbdev 8383 FBDEV = $_fbdev
8381 FREETYPE = $_freetype 8384 FREETYPE = $_freetype
8382 FTP = $_ftp 8385 FTP = $_ftp
8383 GIF = $_gif 8386 GIF = $_gif
8384 GGI = $_ggi 8387 GGI = $_ggi