From 61a4da215c05b621951aa3903d7d390fd1839537 Mon Sep 17 00:00:00 2001 From: ejurgensen Date: Thu, 16 Oct 2014 22:16:25 +0200 Subject: [PATCH] Revert special ffmpeg linker handling - not required any more - ref https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=758337#11 --- configure.ac | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index d71f18f8..4fc034c5 100644 --- a/configure.ac +++ b/configure.ac @@ -158,15 +158,11 @@ fi PKG_CHECK_MODULES(LIBAV, [ libavformat libavcodec libswscale libavutil $libxxresample ]) -dnl For ffmpeg compability -_PKG_CONFIG([lname], [libs-only-l], [libavcodec]) -avc_name=`echo $pkg_cv_lname | sed 's/-l//'` - save_LIBS="$LIBS" dnl Check for av_lock_manager (ffmpeg >= 0.5.1) -AC_CHECK_LIB([$avc_name], [av_lockmgr_register], , AC_MSG_ERROR([libav (ffmpeg) >= 0.5.1 required])) +AC_CHECK_LIB([avcodec], [av_lockmgr_register], , AC_MSG_ERROR([libav (ffmpeg) >= 0.5.1 required])) dnl Check for avcodec_find_best_pix_fmt_of_list (is only in ffmpeg, not libav) -AC_CHECK_LIB([$avc_name], [avcodec_find_best_pix_fmt_of_list], +AC_CHECK_LIB([avcodec], [avcodec_find_best_pix_fmt_of_list], AC_DEFINE(FFMPEG_INCOMPATIBLE_API, 1, [Define to 1 if you have ffmpeg (and not libav).])) LIBS="$save_LIBS"