forked from pool/libquicktime
31 lines
983 B
Diff
31 lines
983 B
Diff
|
From b56b368223216af236f818fbe0924f41b7934577 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
|
||
|
|
Date: Wed, 13 Jun 2018 11:13:53 +0200
|
||
|
|
Subject: [PATCH 2/5] Allow any avcodec to be detected by configure
|
||
|
|
|
||
|
|
---
|
||
|
|
configure.ac | 4 +---
|
||
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index 85dda8f..0ee1166 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -561,12 +561,10 @@ AH_TEMPLATE([HAVE_LIBAVCODEC],
|
||
|
|
|
||
|
|
have_libavcodec=false
|
||
|
|
|
||
|
|
-dnl Require libavcodec less than 56.0.0
|
||
|
|
-
|
||
|
|
AC_ARG_WITH([ffmpeg], AS_HELP_STRING([--without-ffmpeg], [Build without ffmpeg library (default: test)]))
|
||
|
|
|
||
|
|
if test "x$with_ffmpeg" != "xno"; then
|
||
|
|
-PKG_CHECK_MODULES(LIBAVCODEC, [libavcodec < 56.0.0], have_libavcodec="true", have_libavcodec="false")
|
||
|
|
+PKG_CHECK_MODULES(LIBAVCODEC, [libavcodec], have_libavcodec="true", have_libavcodec="false")
|
||
|
|
fi
|
||
|
|
|
||
|
|
AM_CONDITIONAL(HAVE_LIBAVCODEC, test x$have_libavcodec = xtrue)
|
||
|
|
--
|
||
|
|
2.17.1
|
||
|
|
|