From e1629c217e6c7e99225f40a5a7d778217e9a742e Mon Sep 17 00:00:00 2001 From: Jean-Paul Saman Date: Wed, 28 May 2008 14:41:24 +0200 Subject: [PATCH] Remove wrong check for img_resample() when ffmpeg is built with libswscale. img_resample() is on the list of deprecated functions and is currently mutual exclusive with swscale. --- configure.ac | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index b69c5b3293..1e7652ef75 100644 --- a/configure.ac +++ b/configure.ac @@ -3021,10 +3021,7 @@ dnl Trying with pkg-config VLC_ADD_LIBS([ffmpeg],[${SWSCALE_LIBS}]) AC_CHECK_LIB(swscale, sws_getContext, [AC_CHECK_HEADERS([ffmpeg/swscale.h libswscale/swscale.h])], - [AC_CHECK_LIB(avcodec,img_resample,[], - [AC_MSG_ERROR([Your FFmpeg library doesn't have the needed img_resample() function. You should rebuild it with software scaler disabled, or install the swscale headers.])], - [${FFMPEG_LIBS}]) - ], + [], [${SWSCALE_LIBS}]) VLC_RESTORE_FLAGS ],[AC_CHECK_LIB(avcodec,img_resample,[], -- 2.39.2