[patch] patch to accept new ffmpeg layout

new-ffmpeg.patch (text/plain), 1.00 KB, created by Rafał Mużyło on 2008-08-05 22:13:28 UTC

--- configure.in.old	2008-07-14 10:57:59.000000000 +0200
+++ configure.in	2008-08-06 00:07:03.000000000 +0200
@@ -62,7 +62,7 @@
 AC_SUBST(AVCODEC_LIBS)
 AC_CHECK_LIB([avcodec], [avcodec_open], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no])
 if test x$HAVE_AVCODEC = xyes; then
-  AC_CHECK_HEADER([ffmpeg/avcodec.h], [], [HAVE_AVCODEC=no])
+  AC_CHECK_HEADERS([ffmpeg/avcodec.h], , [AC_CHECK_HEADERS([libavcodec/avcodec.h], , [HAVE_AVCODEC=no])])
 fi
 AM_CONDITIONAL(HAVE_AVCODEC, test x$HAVE_AVCODEC = xyes)
 CFLAGS="$CFLAGS_saved"
--- rate-lavc/rate_lavcrate.c.old	2008-07-14 10:57:59.000000000 +0200
+++ rate-lavc/rate_lavcrate.c	2008-08-06 00:02:36.000000000 +0200
@@ -16,10 +16,15 @@
  * Lesser General Public License for more details.
  */
 
+#include "config.h"
 #include <stdio.h>
 #include <alsa/asoundlib.h>
 #include <alsa/pcm_rate.h>
+#ifdef HAVE_FFMPEG_AVCODEC_H
 #include <ffmpeg/avcodec.h>
+#elif defined(HAVE_LIBAVCODEC_AVCODEC_H)
+#include <libavcodec/avcodec.h>
+#endif
 #include "gcd.h"
 
 static int filter_size = 16;