[vlc-devel] commit: Revert "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 ." It was the wrong fix. (Jean-Paul Saman )

[git version control]

vlc | branch: master | Jean-Paul Saman <jpsaman at videolan.org> | Wed May 28 18:11:32 2008 +0200| [b4fdd335a492ae0254f0eb4b50aa46f01cfddd6b]

Revert "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." It was the wrong fix.

This reverts commit e1629c217e6c7e99225f40a5a7d778217e9a742e.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b4fdd335a492ae0254f0eb4b50aa46f01cfddd6b
---

 configure.ac |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index fb32591..056f89f 100644
--- 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.])],