Mercurial > mplayer.hg

changeset 23114:6746f3da381b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge config.h variable declarations into libavcodec test.
author diego
date Thu, 26 Apr 2007 12:53:26 +0000
parents fab09eb403ed
children 66366cb13021
files configure
diffstat 1 files changed, 18 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Thu Apr 26 12:39:09 2007 +0000
+++ b/configure	Thu Apr 26 12:53:26 2007 +0000
@@ -6212,7 +6212,25 @@
   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 @@
 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'