Revert "Remove wrong check for img_resample() when ffmpeg is built with libswscale...

This reverts commit e1629c217e6c7e99225f40a5a7d778217e9a742e.

diff --git a/configure.ac b/configure.ac
index fb32591c213d8c1fb93aa9ee1c1d5e465685930d..056f89fff28353706d81dacede6cec96845bfc91 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3028,7 +3028,10 @@ 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}])
     ],[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.])],