Mercurial > mplayer.hg
comparison configure @ 22118:d389fe536db6
FFmpeg #defines must be uppercase now.
| author | diego |
|---|---|
| date | Mon, 05 Feb 2007 07:33:00 +0000 |
| parents | 0e2241c57733 |
| children | db9f2e48c710 |
comparison
equal
deleted
inserted
replaced
| 22117:15bb9c161e94 | 22118:d389fe536db6 |
|---|---|
| 5866 cc_check -O4 $_ld_faac $_ld_tmp $_ld_lm && _libs_mencoder="$_libs_mencoder $_ld_faac" && _faac=yes && break | 5866 cc_check -O4 $_ld_faac $_ld_tmp $_ld_lm && _libs_mencoder="$_libs_mencoder $_ld_faac" && _faac=yes && break |
| 5867 done | 5867 done |
| 5868 fi | 5868 fi |
| 5869 if test "$_faac" = yes ; then | 5869 if test "$_faac" = yes ; then |
| 5870 _def_faac="#define HAVE_FAAC 1" | 5870 _def_faac="#define HAVE_FAAC 1" |
| 5871 if echo $_libavencoders | grep -q faac ; then | 5871 if echo $_libavencoders | grep -q FAAC ; then |
| 5872 _lavc_faac=yes | 5872 _lavc_faac=yes |
| 5873 _def_lavc_faac="#define CONFIG_LIBFAAC 1" | 5873 _def_lavc_faac="#define CONFIG_LIBFAAC 1" |
| 5874 _libs_mplayer="$_libs_mplayer $_ld_faac" | 5874 _libs_mplayer="$_libs_mplayer $_ld_faac" |
| 5875 else | 5875 else |
| 5876 _lavc_faac=no | 5876 _lavc_faac=no |
| 6504 | 6504 |
| 6505 if test "$_x264" = yes ; then | 6505 if test "$_x264" = yes ; then |
| 6506 _x264=yes | 6506 _x264=yes |
| 6507 _def_x264='#define HAVE_X264 1' | 6507 _def_x264='#define HAVE_X264 1' |
| 6508 _codecmodules="x264 $_codecmodules" | 6508 _codecmodules="x264 $_codecmodules" |
| 6509 if echo $_libavencoders | grep -q x264 ; then | 6509 if echo $_libavencoders | grep -q X264 ; then |
| 6510 _lavc_x264=yes | 6510 _lavc_x264=yes |
| 6511 _def_lavc_x264='#define CONFIG_X264 1' | 6511 _def_lavc_x264='#define CONFIG_X264 1' |
| 6512 _libs_mplayer="$_libs_mplayer $_ld_x264" | 6512 _libs_mplayer="$_libs_mplayer $_ld_x264" |
| 6513 else | 6513 else |
| 6514 _lavc_x264=no | 6514 _lavc_x264=no |
| 6571 cat > $TMPC << EOF | 6571 cat > $TMPC << EOF |
| 6572 #include <lame/lame.h> | 6572 #include <lame/lame.h> |
| 6573 int main(void) { lame_set_preset(NULL, MEDIUM_FAST); return 0; } | 6573 int main(void) { lame_set_preset(NULL, MEDIUM_FAST); return 0; } |
| 6574 EOF | 6574 EOF |
| 6575 cc_check $_ld_mp3lame $_ld_lm && _def_mp3lame_preset_medium="#define HAVE_MP3LAME_PRESET_MEDIUM" | 6575 cc_check $_ld_mp3lame $_ld_lm && _def_mp3lame_preset_medium="#define HAVE_MP3LAME_PRESET_MEDIUM" |
| 6576 if echo $_libavencoders | grep -q mp3lame ; then | 6576 if echo $_libavencoders | grep -q MP3LAME ; then |
| 6577 _lavc_mp3lame=yes | 6577 _lavc_mp3lame=yes |
| 6578 _def_lavc_mp3lame="#define CONFIG_LIBMP3LAME 1" | 6578 _def_lavc_mp3lame="#define CONFIG_LIBMP3LAME 1" |
| 6579 _libs_mplayer="$_libs_mplayer $_ld_mp3lame" | 6579 _libs_mplayer="$_libs_mplayer $_ld_mp3lame" |
| 6580 else | 6580 else |
| 6581 _lavc_mp3lame=no | 6581 _lavc_mp3lame=no |
| 6593 if test "$_mencoder" = yes ; then | 6593 if test "$_mencoder" = yes ; then |
| 6594 _mencoder_flag='#define HAVE_MENCODER' | 6594 _mencoder_flag='#define HAVE_MENCODER' |
| 6595 _def_muxers='#define CONFIG_MUXERS 1' | 6595 _def_muxers='#define CONFIG_MUXERS 1' |
| 6596 else | 6596 else |
| 6597 # mpeg1video for vf_lavc, snow for vf_uspp and vf_mcdeint | 6597 # mpeg1video for vf_lavc, snow for vf_uspp and vf_mcdeint |
| 6598 _libavencoders="mpeg1video_encoder snow_encoder" | 6598 _libavencoders="MPEG1VIDEO_ENCODER SNOW_ENCODER" |
| 6599 _libavmuxers="" | 6599 _libavmuxers="" |
| 6600 fi | 6600 fi |
| 6601 echores "$_mencoder" | 6601 echores "$_mencoder" |
| 6602 | 6602 |
| 6603 echocheck "fastmemcpy" | 6603 echocheck "fastmemcpy" |