changeset 32175:f002b9d0f4d1

Update mp3lame_lavc check to match recent FFmpeg changes.
author diego
date Thu, 16 Sep 2010 09:36:45 +0000
parents 6a1d3ea9a0c0
children 597a376752a7
files configure
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Thu Sep 16 01:09:59 2010 +0000
+++ b/configure	Thu Sep 16 09:36:45 2010 +0000
@@ -7434,7 +7434,10 @@
   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"