Mercurial > mplayer.hg

comparison configure @ 26665:e92438e215d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cosmetics: Rename _def_lavc_* variables to _def_*_lavc.
author diego
date Thu, 08 May 2008 21:50:31 +0000
parents 20ca4b11cb9c
children 581637633ec4
comparison
equal deleted inserted replaced
26664:b372d0e6d10f 26665:e92438e215d9
6024 fi 6024 fi
6025 if test "$_faac" = yes ; then 6025 if test "$_faac" = yes ; then
6026 _def_faac="#define HAVE_FAAC 1" 6026 _def_faac="#define HAVE_FAAC 1"
6027 if echo $_libavencoders | grep -q FAAC ; then 6027 if echo $_libavencoders | grep -q FAAC ; then
6028 _lavc_faac=yes 6028 _lavc_faac=yes
6029 _def_lavc_faac="#define CONFIG_LIBFAAC 1" 6029 _def_faac_lavc="#define CONFIG_LIBFAAC 1"
6030 _libs_mplayer="$_libs_mplayer $_ld_faac" 6030 _libs_mplayer="$_libs_mplayer $_ld_faac"
6031 else 6031 else
6032 _lavc_faac=no 6032 _lavc_faac=no
6033 _def_lavc_faac="#undef CONFIG_LIBFAAC" 6033 _def_faac_lavc="#undef CONFIG_LIBFAAC"
6034 fi 6034 fi
6035 _codecmodules="faac $_codecmodules" 6035 _codecmodules="faac $_codecmodules"
6036 else 6036 else
6037 _def_faac="#undef HAVE_FAAC" 6037 _def_faac="#undef HAVE_FAAC"
6038 _nocodecmodules="faac $_nocodecmodules" 6038 _nocodecmodules="faac $_nocodecmodules"
6548 #include <xvid.h> 6548 #include <xvid.h>
6549 int main(void) { xvid_plugin_2pass2_t s; s.vbv_size=0; return 0; } 6549 int main(void) { xvid_plugin_2pass2_t s; s.vbv_size=0; return 0; }
6550 EOF 6550 EOF
6551 if cc_check ; then 6551 if cc_check ; then
6552 _lavc_xvid=yes 6552 _lavc_xvid=yes
6553 _def_lavc_xvid='#define CONFIG_LIBXVID 1' 6553 _def_xvid_lavc='#define CONFIG_LIBXVID 1'
6554 _libavencoders="$_libavencoders LIBXVID_ENCODER" 6554 _libavencoders="$_libavencoders LIBXVID_ENCODER"
6555 else 6555 else
6556 _lavc_xvid=no 6556 _lavc_xvid=no
6557 _def_lavc_xvid='#undef CONFIG_LIBXVID' 6557 _def_xvid_lavc='#undef CONFIG_LIBXVID'
6558 fi 6558 fi
6559 echores "$_lavc_xvid" 6559 echores "$_lavc_xvid"
6560 fi 6560 fi
6561 6561
6562 6562
6577 fi 6577 fi
6578 6578
6579 if test "$_x264" = yes ; then 6579 if test "$_x264" = yes ; then
6580 _def_x264='#define HAVE_X264 1' 6580 _def_x264='#define HAVE_X264 1'
6581 _codecmodules="x264 $_codecmodules" 6581 _codecmodules="x264 $_codecmodules"
6582 _def_lavc_x264='#define CONFIG_LIBX264 1' 6582 _def_x264_lavc='#define CONFIG_LIBX264 1'
6583 _libs_mplayer="$_libs_mplayer $_ld_x264" 6583 _libs_mplayer="$_libs_mplayer $_ld_x264"
6584 _libavencoders="$_libavencoders LIBX264_ENCODER" 6584 _libavencoders="$_libavencoders LIBX264_ENCODER"
6585 else 6585 else
6586 _def_x264='#undef HAVE_X264' 6586 _def_x264='#undef HAVE_X264'
6587 _def_lavc_x264='#undef CONFIG_LIBX264' 6587 _def_x264_lavc='#undef CONFIG_LIBX264'
6588 _nocodecmodules="x264 $_nocodecmodules" 6588 _nocodecmodules="x264 $_nocodecmodules"
6589 fi 6589 fi
6590 echores "$_x264" 6590 echores "$_x264"
6591 6591
6592 6592
6666 int main(void) { lame_set_preset(NULL, MEDIUM_FAST); return 0; } 6666 int main(void) { lame_set_preset(NULL, MEDIUM_FAST); return 0; }
6667 EOF 6667 EOF
6668 cc_check $_ld_mp3lame $_ld_lm && _def_mp3lame_preset_medium="#define HAVE_MP3LAME_PRESET_MEDIUM" 6668 cc_check $_ld_mp3lame $_ld_lm && _def_mp3lame_preset_medium="#define HAVE_MP3LAME_PRESET_MEDIUM"
6669 if echo $_libavencoders | grep -q MP3LAME ; then 6669 if echo $_libavencoders | grep -q MP3LAME ; then
6670 _lavc_mp3lame=yes 6670 _lavc_mp3lame=yes
6671 _def_lavc_mp3lame="#define CONFIG_LIBMP3LAME 1" 6671 _def_mp3lame_lavc="#define CONFIG_LIBMP3LAME 1"
6672 _libavencoders="$_libavencoders LIBMP3LAME_ENCODER" 6672 _libavencoders="$_libavencoders LIBMP3LAME_ENCODER"
6673 _libs_mplayer="$_libs_mplayer $_ld_mp3lame" 6673 _libs_mplayer="$_libs_mplayer $_ld_mp3lame"
6674 else 6674 else
6675 _lavc_mp3lame=no 6675 _lavc_mp3lame=no
6676 _def_lavc_mp3lame="#undef CONFIG_LIBMP3LAME" 6676 _def_mp3lame_lavc="#undef CONFIG_LIBMP3LAME"
6677 fi 6677 fi
6678 else 6678 else
6679 _def_mp3lame='#undef HAVE_MP3LAME' 6679 _def_mp3lame='#undef HAVE_MP3LAME'
6680 fi 6680 fi
6681 echores "$_mp3lame" 6681 echores "$_mp3lame"
8148 `ff_config_enable "$_libavdemuxers_all" "$_libavdemuxers"` 8148 `ff_config_enable "$_libavdemuxers_all" "$_libavdemuxers"`
8149 `ff_config_enable "$_libavmuxers_all" "$_libavmuxers"` 8149 `ff_config_enable "$_libavmuxers_all" "$_libavmuxers"`
8150 `ff_config_enable "$_libavprotocols_all" "$_libavprotocols"` 8150 `ff_config_enable "$_libavprotocols_all" "$_libavprotocols"`
8151 `ff_config_enable "$_libavbsfs_all" "$_libavbsfs"` 8151 `ff_config_enable "$_libavbsfs_all" "$_libavbsfs"`
8152 8152
8153 $_def_lavc_faac 8153 $_def_faac_lavc
8154 $_def_lavc_xvid 8154 $_def_mp3lame_lavc
8155 $_def_lavc_mp3lame 8155 $_def_x264_lavc
8156 $_def_lavc_x264 8156 $_def_xvid_lavc
8157 8157
8158 /* Use codec libs included in mplayer CVS / source dist: */ 8158 /* Use codec libs included in mplayer CVS / source dist: */
8159 $_def_mp3lib 8159 $_def_mp3lib
8160 $_def_liba52 8160 $_def_liba52
8161 $_def_libmpeg2 8161 $_def_libmpeg2