aboutsummaryrefslogtreecommitdiffstats
path: root/dists/autogen/m4
diff options
context:
space:
mode:
authorbrian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c>2015-07-15 21:51:27 +0000
committerbrian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c>2015-07-15 21:51:27 +0000
commit0beaaf7f95866304a9cde8f279ad0b0b25335e63 (patch)
tree7ff17bb3bed0968691fc3e9a9e84f66adb164a4c /dists/autogen/m4
parent1b9ad6ec7b2f86c2cf140190002b65a99613bc65 (diff)
downloadusdx-0beaaf7f95866304a9cde8f279ad0b0b25335e63.tar.gz
usdx-0beaaf7f95866304a9cde8f279ad0b0b25335e63.tar.xz
usdx-0beaaf7f95866304a9cde8f279ad0b0b25335e63.zip
Add support for ffmpeg 2.7
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3116 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 aac6d68c..bddc060a 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 54020100; then
+ if test $[$1][_VERSION_INT] -ge 54027100; then
+ FFMPEG_VERSION="2.7"
+ elif test $[$1][_VERSION_INT] -ge 54020100; then
FFMPEG_VERSION="2.6"
elif test $[$1][_VERSION_INT] -ge 54015100; then
FFMPEG_VERSION="2.5"