Skip to content

V
vlc
Commit 184e8e76 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

avcodec: allow compilation with lavc 55

parent 7a4eb7be
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
configure.ac
View file @ 184e8e76
...@@ -2220,8 +2220,13 @@ AC_ARG_ENABLE(avcodec, ...@@ -2220,8 +2220,13 @@ AC_ARG_ENABLE(avcodec,
[ --enable-avcodec libavcodec codec (default enabled)]) [ --enable-avcodec libavcodec codec (default enabled)])
AS_IF([test "${enable_avcodec}" != "no"], [ AS_IF([test "${enable_avcodec}" != "no"], [
PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 54.25.0 libavutil >= 51.22.0], [ PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 54.25.0 libavutil >= 51.22.0], [
PKG_CHECK_EXISTS([libavcodec < 55],, [ AS_IF([test "${enable_sout}" != "no"], [
AC_MSG_ERROR([libavcodec versions 55 and later are not supported yet.]) PKG_CHECK_EXISTS([libavcodec < 55],, [
AC_MSG_ERROR([libavcodec version 55 requires --disable-sout.])
])
])
PKG_CHECK_EXISTS([libavcodec < 56],, [
AC_MSG_ERROR([libavcodec versions 56 and later are not supported yet.])
]) ])
VLC_SAVE_FLAGS VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
......
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