diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-26 12:53:26 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-26 12:53:26 +0000 |
| commit | 424b9eddbbff9e4c032040f93dafcad54bd2ae61 (patch) | |
| tree | ab18170903526075b09c1c983b578a391b2e0da3 /configure | |
| parent | 0c94045c6f67e8b69afe391dfe8e95c8e17d1628 (diff) | |
| download | mpv-424b9eddbbff9e4c032040f93dafcad54bd2ae61.tar.bz2 mpv-424b9eddbbff9e4c032040f93dafcad54bd2ae61.tar.xz | |
Merge config.h variable declarations into libavcodec test.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23132 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 36 |
1 files changed, 18 insertions, 18 deletions
@@ -6212,7 +6212,25 @@ EOF fi fi _libavcodec=no +_def_libavcodec='#undef USE_LIBAVCODEC' +_def_libavcodec_so='#undef USE_LIBAVCODEC_SO' +_def_lavc_dsputil='#undef USE_LIBAVCODEC_DSPUTIL' test "$_libavcodec_a" = yes || test "$_libavcodec_so" = yes && _libavcodec=yes +test "$_libavcodec_a" = yes \ + && _def_lavc_dsputil='#define USE_LIBAVCODEC_DSPUTIL' +test "$_libavcodec_so" = yes \ + && _def_lavc_dsputil='#define USE_LIBAVCODEC_SO 1' +test "$_libavcodec" = yes \ + && _def_lavc_dsputil='#define USE_LIBAVCODEC 1' +test "$_libavcodec_mpegaudio_hp" = yes \ + && _def_libavcodec_mpegaudio_hp='#define CONFIG_MPEGAUDIO_HP 1' +if test "$_libavcodec_a" = yes ; then + _codecmodules="libavcodec $_codecmodules" +elif test "$_libavcodec_so" = yes ; then + _codecmodules="libavcodec.so $_codecmodules" +else + _nocodecmodules="libavcodec $_nocodecmodules" +fi echores "$_libavcodec" echocheck "FFmpeg libavformat" @@ -6269,24 +6287,6 @@ _libpostproc=no test "$_libpostproc_a" = yes || test "$_libpostproc_so" = yes && _libpostproc=yes echores "$_libpostproc" -_def_libavcodec='#undef USE_LIBAVCODEC' -_def_libavcodec_so='#undef USE_LIBAVCODEC_SO' -_def_lavc_dsputil='#undef USE_LIBAVCODEC_DSPUTIL' -if test "$_libavcodec_mpegaudio_hp" = yes ; then - _def_libavcodec_mpegaudio_hp='#define CONFIG_MPEGAUDIO_HP 1' -fi -if test "$_libavcodec_a" = yes ; then - _def_libavcodec='#define USE_LIBAVCODEC 1' - _def_lavc_dsputil='#define USE_LIBAVCODEC_DSPUTIL' - _codecmodules="libavcodec $_codecmodules" -elif test "$_libavcodec_so" = yes ; then - _def_libavcodec='#define USE_LIBAVCODEC 1' - _def_libavcodec_so='#define USE_LIBAVCODEC_SO 1' - _codecmodules="libavcodec.so $_codecmodules" -else - _nocodecmodules="libavcodec $_nocodecmodules" -fi - _def_libavformat='#undef USE_LIBAVFORMAT' _def_libavformat_so='#undef USE_LIBAVFORMAT_SO' _def_libavformat_win32='#undef CONFIG_WIN32' |