avcodec: allow compilation with lavc 55

184e8e76 · Rémi Denis-Courmont · 7a4eb7be · 184e8e76
Commit 184e8e76 authored Mar 08, 2013 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

configure.ac configure.ac +7 -2

No files found.
--- 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}"