aboutsummaryrefslogtreecommitdiffstats
path: root/dists/autogen/m4
diff options
context:
space:
mode:
authorbrian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c>2014-12-27 17:09:11 +0000
committerbrian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c>2014-12-27 17:09:11 +0000
commita396fd0095b129447bed544a1d0ef7de45279843 (patch)
treec98ccdf940e1fe4de32d1ee9eba76217ba3b288b /dists/autogen/m4
parent22a2a88736de35e934ebd66ba576cf45f0ec4a57 (diff)
downloadusdx-a396fd0095b129447bed544a1d0ef7de45279843.tar.gz
usdx-a396fd0095b129447bed544a1d0ef7de45279843.tar.xz
usdx-a396fd0095b129447bed544a1d0ef7de45279843.zip
Adding ffmpeg-2.5, tested in Arch Linux.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3109 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'dists/autogen/m4')
-rw-r--r--dists/autogen/m4/pkg_config_utils.m44
1 files changed, 3 insertions, 1 deletions
diff --git a/dists/autogen/m4/pkg_config_utils.m4 b/dists/autogen/m4/pkg_config_utils.m4
index e26b20ec..372649bb 100644
--- a/dists/autogen/m4/pkg_config_utils.m4
+++ b/dists/autogen/m4/pkg_config_utils.m4
@@ -101,7 +101,9 @@ AC_DEFUN([PKG_VERSION],
if test $1 = "libavutil"; then
AC_MSG_CHECKING([version of ffmpeg])
if test $[$1][_VERSION_INT] -le 60000000; then
- if test $[$1][_VERSION_INT] -ge 54007001; then
+ if test $[$1][_VERSION_INT] -ge 54015100; then
+ FFMPEG_VERSION="2.5"
+ elif test $[$1][_VERSION_INT] -ge 54007001; then
FFMPEG_VERSION="2.4"
elif test $[$1][_VERSION_INT] -ge 52066100; then
FFMPEG_VERSION="2.2"