aboutsummaryrefslogtreecommitdiffstats
path: root/dists
diff options
context:
space:
mode:
authorbrian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c>2015-09-26 18:11:45 +0000
committerbrian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c>2015-09-26 18:11:45 +0000
commit98a62d73be92880f5cbbcf2ffb26b6fcecb0a368 (patch)
treecb28caf388534eb1fc1a080ac708981ca046a00f /dists
parent2e9bbbe980adfe19de9e5dffe9c57ac0df236b65 (diff)
downloadusdx-98a62d73be92880f5cbbcf2ffb26b6fcecb0a368.tar.gz
usdx-98a62d73be92880f5cbbcf2ffb26b6fcecb0a368.tar.xz
usdx-98a62d73be92880f5cbbcf2ffb26b6fcecb0a368.zip
Add support for ffmpeg 2.8
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3139 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'dists')
-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 bddc060a..8fe5cf2a 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 54027100; then
+ if test $[$1][_VERSION_INT] -ge 54031100; then
+ FFMPEG_VERSION="2.8"
+ elif test $[$1][_VERSION_INT] -ge 54027100; then
FFMPEG_VERSION="2.7"
elif test $[$1][_VERSION_INT] -ge 54020100; then
FFMPEG_VERSION="2.6"