Mercurial > mplayer.hg
comparison configure @ 30510:0c58f223b6d8
Use normal way to add CONFIG_HARDCODED_TABLES/CONFIG_MPEGAUDIO_HP to config.mak.
author | diego |
---|---|
date | Sat, 13 Feb 2010 15:51:03 +0000 |
parents | c0ab27a3b90e |
children | 59750cd96b29 |
comparison
equal
deleted
inserted
replaced
30509:c0ab27a3b90e | 30510:0c58f223b6d8 |
---|---|
3526 | 3526 |
3527 | 3527 |
3528 echocheck "hard-coded tables" | 3528 echocheck "hard-coded tables" |
3529 if test "$hardcoded_tables" = yes ; then | 3529 if test "$hardcoded_tables" = yes ; then |
3530 def_hardcoded_tables='#define CONFIG_HARDCODED_TABLES 1' | 3530 def_hardcoded_tables='#define CONFIG_HARDCODED_TABLES 1' |
3531 mak_hardcoded_tables='CONFIG_HARDCODED_TABLES = yes' | |
3532 else | 3531 else |
3533 def_hardcoded_tables='#define CONFIG_HARDCODED_TABLES 0' | 3532 def_hardcoded_tables='#define CONFIG_HARDCODED_TABLES 0' |
3534 fi | 3533 fi |
3535 echores "$hardcoded_tables" | 3534 echores "$hardcoded_tables" |
3536 | 3535 |
7308 test "$_libavcodec_a" = yes || test "$_libavcodec_so" = yes && _libavcodec=yes | 7307 test "$_libavcodec_a" = yes || test "$_libavcodec_so" = yes && _libavcodec=yes |
7309 test "$_libavcodec" = yes && def_libavcodec='#define CONFIG_LIBAVCODEC 1' | 7308 test "$_libavcodec" = yes && def_libavcodec='#define CONFIG_LIBAVCODEC 1' |
7310 test "$_libavcodec_a" = yes && def_libavcodec_a='#define CONFIG_LIBAVCODEC_A 1' | 7309 test "$_libavcodec_a" = yes && def_libavcodec_a='#define CONFIG_LIBAVCODEC_A 1' |
7311 test "$_libavcodec_so" = yes && def_libavcodec_so='#define CONFIG_LIBAVCODEC_SO 1' | 7310 test "$_libavcodec_so" = yes && def_libavcodec_so='#define CONFIG_LIBAVCODEC_SO 1' |
7312 test "$_libavcodec_mpegaudio_hp" = yes \ | 7311 test "$_libavcodec_mpegaudio_hp" = yes \ |
7313 && def_libavcodec_mpegaudio_hp='#define CONFIG_MPEGAUDIO_HP 1' \ | 7312 && def_libavcodec_mpegaudio_hp='#define CONFIG_MPEGAUDIO_HP 1' |
7314 && mak_libavcodec_mpegaudio_hp='CONFIG_MPEGAUDIO_HP = yes' | |
7315 if test "$_libavcodec_a" = yes ; then | 7313 if test "$_libavcodec_a" = yes ; then |
7316 _codecmodules="libavcodec(internal) $_codecmodules" | 7314 _codecmodules="libavcodec(internal) $_codecmodules" |
7317 elif test "$_libavcodec_so" = yes ; then | 7315 elif test "$_libavcodec_so" = yes ; then |
7318 _codecmodules="libavcodec.so $_codecmodules" | 7316 _codecmodules="libavcodec.so $_codecmodules" |
7319 else | 7317 else |
8582 ESD = $_esd | 8580 ESD = $_esd |
8583 FAAC=$_faac | 8581 FAAC=$_faac |
8584 FAAD = $_faad | 8582 FAAD = $_faad |
8585 FAAD_INTERNAL = $_faad_internal | 8583 FAAD_INTERNAL = $_faad_internal |
8586 FASTMEMCPY = $_fastmemcpy | 8584 FASTMEMCPY = $_fastmemcpy |
8587 $mak_hardcoded_tables | |
8588 $mak_libavcodec_mpegaudio_hp | |
8589 FBDEV = $_fbdev | 8585 FBDEV = $_fbdev |
8590 FREETYPE = $_freetype | 8586 FREETYPE = $_freetype |
8591 FTP = $_ftp | 8587 FTP = $_ftp |
8592 GIF = $_gif | 8588 GIF = $_gif |
8593 GGI = $_ggi | 8589 GGI = $_ggi |
8753 CONFIG_RDFT=yes | 8749 CONFIG_RDFT=yes |
8754 | 8750 |
8755 CONFIG_BZLIB=$bzlib | 8751 CONFIG_BZLIB=$bzlib |
8756 CONFIG_ENCODERS=yes | 8752 CONFIG_ENCODERS=yes |
8757 CONFIG_GPL=yes | 8753 CONFIG_GPL=yes |
8754 CONFIG_HARDCODED_TABLES=$hardcoded_tables | |
8758 CONFIG_LIBDIRAC_DECODER=$_libdirac_lavc | 8755 CONFIG_LIBDIRAC_DECODER=$_libdirac_lavc |
8759 CONFIG_LIBDIRAC_ENCODER=$_libdirac_lavc | 8756 CONFIG_LIBDIRAC_ENCODER=$_libdirac_lavc |
8760 CONFIG_LIBFAAC_ENCODER=$_faac_lavc | 8757 CONFIG_LIBFAAC_ENCODER=$_faac_lavc |
8761 CONFIG_LIBMP3LAME_ENCODER=$_mp3lame_lavc | 8758 CONFIG_LIBMP3LAME_ENCODER=$_mp3lame_lavc |
8762 CONFIG_LIBOPENCORE_AMRNB_DECODER=$_libopencore_amrnb | 8759 CONFIG_LIBOPENCORE_AMRNB_DECODER=$_libopencore_amrnb |
8768 CONFIG_LIBSCHROEDINGER_ENCODER=$_libschroedinger_lavc | 8765 CONFIG_LIBSCHROEDINGER_ENCODER=$_libschroedinger_lavc |
8769 CONFIG_LIBVORBIS_ENCODER=$_libvorbis | 8766 CONFIG_LIBVORBIS_ENCODER=$_libvorbis |
8770 CONFIG_LIBX264_ENCODER=$_x264_lavc | 8767 CONFIG_LIBX264_ENCODER=$_x264_lavc |
8771 CONFIG_LIBXVID_ENCODER=$_xvid_lavc | 8768 CONFIG_LIBXVID_ENCODER=$_xvid_lavc |
8772 CONFIG_MLIB = $_mlib | 8769 CONFIG_MLIB = $_mlib |
8770 CONFIG_MPEGAUDIO_HP = $_libavcodec_mpegaudio_hp | |
8773 CONFIG_MUXERS=$_mencoder | 8771 CONFIG_MUXERS=$_mencoder |
8774 CONFIG_POSTPROC = yes | 8772 CONFIG_POSTPROC = yes |
8775 # Prevent building libavcodec/imgresample.c with conflicting symbols | 8773 # Prevent building libavcodec/imgresample.c with conflicting symbols |
8776 CONFIG_SWSCALE=yes | 8774 CONFIG_SWSCALE=yes |
8777 CONFIG_VDPAU=$_vdpau | 8775 CONFIG_VDPAU=$_vdpau |