comparison configure @ 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
comparison
equal deleted inserted replaced
21984:607909d7cc56 21985:f50f197039ae
5909 fi 5909 fi
5910 if test "$_faac" = yes ; then 5910 if test "$_faac" = yes ; then
5911 _def_faac="#define HAVE_FAAC 1" 5911 _def_faac="#define HAVE_FAAC 1"
5912 if echo $_libavencoders | grep -q faac ; then 5912 if echo $_libavencoders | grep -q faac ; then
5913 _lavc_faac=yes 5913 _lavc_faac=yes
5914 _def_lavc_faac="#define CONFIG_FAAC 1" 5914 _def_lavc_faac="#define CONFIG_LIBFAAC 1"
5915 _libs_mplayer="$_libs_mplayer $_ld_faac" 5915 _libs_mplayer="$_libs_mplayer $_ld_faac"
5916 else 5916 else
5917 _lavc_faac=no 5917 _lavc_faac=no
5918 _def_lavc_faac="#undef CONFIG_FAAC" 5918 _def_lavc_faac="#undef CONFIG_LIBFAAC"
5919 fi 5919 fi
5920 _codecmodules="faac $_codecmodules" 5920 _codecmodules="faac $_codecmodules"
5921 else 5921 else
5922 _def_faac="#undef HAVE_FAAC" 5922 _def_faac="#undef HAVE_FAAC"
5923 _nocodecmodules="faac $_nocodecmodules" 5923 _nocodecmodules="faac $_nocodecmodules"
6614 int main(void) { lame_set_preset(NULL, MEDIUM_FAST); return 0; } 6614 int main(void) { lame_set_preset(NULL, MEDIUM_FAST); return 0; }
6615 EOF 6615 EOF
6616 cc_check $_ld_mp3lame $_ld_lm && _def_mp3lame_preset_medium="#define HAVE_MP3LAME_PRESET_MEDIUM" 6616 cc_check $_ld_mp3lame $_ld_lm && _def_mp3lame_preset_medium="#define HAVE_MP3LAME_PRESET_MEDIUM"
6617 if echo $_libavencoders | grep -q mp3lame ; then 6617 if echo $_libavencoders | grep -q mp3lame ; then
6618 _lavc_mp3lame=yes 6618 _lavc_mp3lame=yes
6619 _def_lavc_mp3lame="#define CONFIG_MP3LAME 1" 6619 _def_lavc_mp3lame="#define CONFIG_LIBMP3LAME 1"
6620 _libs_mplayer="$_libs_mplayer $_ld_mp3lame" 6620 _libs_mplayer="$_libs_mplayer $_ld_mp3lame"
6621 else 6621 else
6622 _lavc_mp3lame=no 6622 _lavc_mp3lame=no
6623 _def_lavc_mp3lame="#undef CONFIG_MP3LAME" 6623 _def_lavc_mp3lame="#undef CONFIG_LIBMP3LAME"
6624 fi 6624 fi
6625 else 6625 else
6626 _def_mp3lame='#undef HAVE_MP3LAME' 6626 _def_mp3lame='#undef HAVE_MP3LAME'
6627 fi 6627 fi
6628 echores "$_mp3lame" 6628 echores "$_mp3lame"
7621 `echo $_libavdecoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` 7621 `echo $_libavdecoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
7622 `echo $_libavencoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` 7622 `echo $_libavencoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
7623 `echo $_libavparsers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` 7623 `echo $_libavparsers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
7624 `echo $_libavdemuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` 7624 `echo $_libavdemuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
7625 `echo $_libavmuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` 7625 `echo $_libavmuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
7626 CONFIG_FAAC=$_lavc_faac 7626 CONFIG_LIBFAAC=$_lavc_faac
7627 CONFIG_LIBMP3LAME=$_lavc_mp3lame 7627 CONFIG_LIBMP3LAME=$_lavc_mp3lame
7628 CONFIG_XVID=$_lavc_xvid 7628 CONFIG_XVID=$_lavc_xvid
7629 CONFIG_X264=$_lavc_x264 7629 CONFIG_X264=$_lavc_x264
7630 CONFIG_ZLIB=$_zlib 7630 CONFIG_ZLIB=$_zlib
7631 CONFIG_GPL=yes 7631 CONFIG_GPL=yes