vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Fri Mar 8 18:34:14 2013 +0200| [184e8e76c475c19d1626e6c2d90460e8b1fa9e6c] | committer: Rémi Denis-Courmont
avcodec: allow compilation with lavc 55 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=184e8e76c475c19d1626e6c2d90460e8b1fa9e6c --- configure.ac | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 29f89c7..ffdb097 100644 --- a/configure.ac +++ b/configure.ac @@ -2220,8 +2220,13 @@ AC_ARG_ENABLE(avcodec, [ --enable-avcodec libavcodec codec (default enabled)]) AS_IF([test "${enable_avcodec}" != "no"], [ PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 54.25.0 libavutil >= 51.22.0], [ - PKG_CHECK_EXISTS([libavcodec < 55],, [ - AC_MSG_ERROR([libavcodec versions 55 and later are not supported yet.]) + AS_IF([test "${enable_sout}" != "no"], [ + 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 CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
