Mercurial > mplayer.hg
changeset 30227:052c823850f0
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 | cf58d8f46d98 |
| children | 522c5ef11d6a |
| files | configure |
| diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sun Jan 10 19:59:36 2010 +0000 +++ b/configure Sun Jan 10 20:32:19 2010 +0000 @@ -3351,6 +3351,7 @@ 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 @@ -7112,7 +7113,8 @@ 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 @@ -8376,7 +8378,8 @@ FAAD = $_faad FAAD_INTERNAL = $_faad_internal FASTMEMCPY = $_fastmemcpy -CONFIG_HARDCODED_TABLES = $hardcoded_tables +$mak_hardcoded_tables +$mak_libavcodec_mpegaudio_hp FBDEV = $_fbdev FREETYPE = $_freetype FTP = $_ftp