[MPlayer-cvslog] r32259 - trunk/configure

diego subversion at mplayerhq.hu
Thu Sep 16 11:36:45 CEST 2010


Author: diego
Date: Thu Sep 16 11:36:45 2010
New Revision: 32259

Log:
Update mp3lame_lavc check to match recent FFmpeg changes.

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Thu Sep 16 03:09:59 2010	(r32258)
+++ trunk/configure	Thu Sep 16 11:36:45 2010	(r32259)
@@ -7434,7 +7434,10 @@ if test "$_mp3lame" = yes ; then
   libs_mencoder="$libs_mencoder $_ld_mp3lame"
   function_check lame/lame.h 'lame_set_preset(NULL, STANDARD_FAST)' $_ld_mp3lame $_ld_lm && def_mp3lame_preset="#define CONFIG_MP3LAME_PRESET 1"
   function_check lame/lame.h 'lame_set_preset(NULL,   MEDIUM_FAST)' $_ld_mp3lame $_ld_lm && def_mp3lame_preset_medium="#define CONFIG_MP3LAME_PRESET_MEDIUM 1"
-  test "$_mp3lame_lavc" = auto && _mp3lame_lavc=yes
+  if test "$_mp3lame_lavc" = auto; then
+    _mp3lame_lavc=no
+    function_check lame/lame.h 'hip_decode_init()' -lmp3lame $_ld_lm && _mp3lame_lavc=yes
+  fi
   if test "$_mp3lame_lavc" = yes ; then
     def_mp3lame_lavc="#define CONFIG_LIBMP3LAME 1"
     libavencoders="$libavencoders LIBMP3LAME_ENCODER"


More information about the MPlayer-cvslog mailing list