shithub: sox

Download patch

ref: 2a87f8e5483385264b3d761e3c3b0971cf5064e1
parent: 4907986372da2e2a54923c5ebbfab5cb1e85a027
author: evilynux <evilynux>
date: Sun Feb 13 23:03:17 EST 2011

Look for avcodec_decode_audio3; we now require libavcodec >= 0.6.

--- a/m4/ffmpeg.m4
+++ b/m4/ffmpeg.m4
@@ -47,11 +47,14 @@
   CFLAGS="$CFLAGS $FFMPEG_CFLAGS"
   CPPFLAGS="$CPPFLAGS $FFMPEG_CFLAGS"
   LIBS="$LIBS $FFMPEG_LIBS"
-  have_ffmpeg="no"
+
   AC_CHECK_HEADERS([libavformat/avformat.h ffmpeg/avformat.h],
-    [AC_CHECK_LIB(avformat, av_open_input_file, 
-                 have_ffmpeg=yes)
-    break])
+    [AC_CHECK_LIB(avformat, av_open_input_file, have_ffmpeg=yes, have_ffmpeg=no
+                  break)])
+  AC_CHECK_HEADERS([libavcodec/avcodec.h ffmpeg/avcodec.h],
+    [AC_CHECK_LIB(avcodec, avcodec_decode_audio3, have_ffmpeg=yes, have_ffmpeg=no
+                  break)])
+
   CFLAGS="$ac_save_CFLAGS"
   CPPFAGS="$ac_save_CPPFLAGS"
   LIBS="$ac_save_LIBS"