Skip to content

V
vlc-2-2
Commit fc68d313 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Fix detection of swscale with compile/link test.

parent 7d250086
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
configure.ac
View file @ fc68d313
...@@ -3097,13 +3097,13 @@ dnl Trying with pkg-config ...@@ -3097,13 +3097,13 @@ dnl Trying with pkg-config
VLC_ADD_LIBS([ffmpeg stream_out_switcher],[${FFMPEG_LIBS}]) VLC_ADD_LIBS([ffmpeg stream_out_switcher],[${FFMPEG_LIBS}])
dnl even newer ffmpeg has a libswscale dnl even newer ffmpeg has a libswscale
PKG_CHECK_MODULES(SWSCALE,[libavutil, libswscale],[ PKG_CHECK_MODULES(SWSCALE,[libswscale],[
VLC_ADD_CFLAGS([ffmpeg],[${SWSCALE_CFLAGS}]) VLC_ADD_CFLAGS([ffmpeg],[${SWSCALE_CFLAGS}])
VLC_ADD_LIBS([ffmpeg],[${SWSCALE_LIBS}]) VLC_ADD_LIBS([ffmpeg],[${SWSCALE_LIBS}])
AC_CHECK_HEADERS(ffmpeg/swscale.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/swscale.h.])]) dnl AC_CHECK_HEADERS(ffmpeg/swscale.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/swscale.h.])])
dnl AC_CHECK_LIB(swscale, sws_getContext, AC_CHECK_LIB(swscale, sws_getContext,
dnl [AC_CHECK_HEADERS([ffmpeg/avutil.h, ffmpeg/swscale.h])],[]) [AC_CHECK_HEADERS([ffmpeg/avutil.h, ffmpeg/swscale.h])],[],[-lavutil -lm])
dnl ],[ true ]) ],[ true ])
VLC_RESTORE_FLAGS VLC_RESTORE_FLAGS
],[ ],[
......
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