Skip to content

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

Fix detection of libswscale. It depends on libavutil.

parent c13d2637
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
configure.ac
View file @ 37f14665
...@@ -3086,10 +3086,11 @@ dnl Trying with pkg-config ...@@ -3086,10 +3086,11 @@ dnl Trying with pkg-config
fi fi
VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[${FFMPEG_CFLAGS}]) VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[${FFMPEG_CFLAGS}])
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, libswscale,[ PKG_CHECK_MODULES(SWSCALE, libavutil, 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_LIB(swscale, sws_getContext, AC_CHECK_LIB(swscale, sws_getContext,
[AC_CHECK_HEADERS(ffmpeg/swscale.h)],[]) [AC_CHECK_HEADERS(ffmpeg/swscale.h)],[])
],[ true ]) ],[ true ])
......
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