Revert "Remove wrong check for img_resample() when ffmpeg is built with libswscale...
authorJean-Paul Saman <jpsaman@videolan.org>
Wed, 28 May 2008 16:11:32 +0000 (18:11 +0200)
committerJean-Paul Saman <jpsaman@videolan.org>
Wed, 28 May 2008 16:11:32 +0000 (18:11 +0200)
This reverts commit e1629c217e6c7e99225f40a5a7d778217e9a742e.

configure.ac

index fb32591..056f89f 100644 (file)
@@ -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.])],