Commit b4fdd335 authored by Jean-Paul Saman's avatar Jean-Paul Saman

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

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 e1629c21.
parent dd61f37b
...@@ -3028,7 +3028,10 @@ dnl Trying with pkg-config ...@@ -3028,7 +3028,10 @@ dnl Trying with pkg-config
VLC_ADD_LIBS([ffmpeg],[${SWSCALE_LIBS}]) VLC_ADD_LIBS([ffmpeg],[${SWSCALE_LIBS}])
AC_CHECK_LIB(swscale, sws_getContext, AC_CHECK_LIB(swscale, sws_getContext,
[AC_CHECK_HEADERS([ffmpeg/swscale.h libswscale/swscale.h])], [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}]) [${SWSCALE_LIBS}])
],[AC_CHECK_LIB(avcodec,img_resample,[], ],[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.])], [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.])],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment