avcodec: allow compilation with lavc 55

diff --git a/configure.ac b/configure.ac
index 29f89c771e611ff3b3097889a9ba97eaca98c29b..ffdb097ad10e66d3b6588653650e37e958e04a63 100644 (file)
--- 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}"