Mercurial > mplayer.hg
changeset 21985:f50f197039ae
Rename a few variables to match FFmpeg.
patch by Brett Goulder, predatorfreak dcaf-security org
| author | diego |
|---|---|
| date | Wed, 24 Jan 2007 07:36:50 +0000 |
| parents | 607909d7cc56 |
| children | 85d0b02f2a2d |
| files | configure |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Wed Jan 24 00:10:47 2007 +0000 +++ b/configure Wed Jan 24 07:36:50 2007 +0000 @@ -5911,11 +5911,11 @@ _def_faac="#define HAVE_FAAC 1" if echo $_libavencoders | grep -q faac ; then _lavc_faac=yes - _def_lavc_faac="#define CONFIG_FAAC 1" + _def_lavc_faac="#define CONFIG_LIBFAAC 1" _libs_mplayer="$_libs_mplayer $_ld_faac" else _lavc_faac=no - _def_lavc_faac="#undef CONFIG_FAAC" + _def_lavc_faac="#undef CONFIG_LIBFAAC" fi _codecmodules="faac $_codecmodules" else @@ -6616,11 +6616,11 @@ cc_check $_ld_mp3lame $_ld_lm && _def_mp3lame_preset_medium="#define HAVE_MP3LAME_PRESET_MEDIUM" if echo $_libavencoders | grep -q mp3lame ; then _lavc_mp3lame=yes - _def_lavc_mp3lame="#define CONFIG_MP3LAME 1" + _def_lavc_mp3lame="#define CONFIG_LIBMP3LAME 1" _libs_mplayer="$_libs_mplayer $_ld_mp3lame" else _lavc_mp3lame=no - _def_lavc_mp3lame="#undef CONFIG_MP3LAME" + _def_lavc_mp3lame="#undef CONFIG_LIBMP3LAME" fi else _def_mp3lame='#undef HAVE_MP3LAME' @@ -7623,7 +7623,7 @@ `echo $_libavparsers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` `echo $_libavdemuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` `echo $_libavmuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` -CONFIG_FAAC=$_lavc_faac +CONFIG_LIBFAAC=$_lavc_faac CONFIG_LIBMP3LAME=$_lavc_mp3lame CONFIG_XVID=$_lavc_xvid CONFIG_X264=$_lavc_x264