aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c>2014-07-19 21:18:26 +0000
committerbrian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c>2014-07-19 21:18:26 +0000
commit88c7140aa66f3403cbca2b8a3bf97683e091db51 (patch)
tree3dba1a0d4731dfce1c261f46a855af502df9e136
parentc84bde82dae474092242f5459c0a88fdda4527e6 (diff)
downloadusdx-88c7140aa66f3403cbca2b8a3bf97683e091db51.tar.gz
usdx-88c7140aa66f3403cbca2b8a3bf97683e091db51.tar.xz
usdx-88c7140aa66f3403cbca2b8a3bf97683e091db51.zip
Add detection of ffmpeg 2.2
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3077 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-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 26e2af18..878d91d6 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 52048100; then
+ if test $[$1][_VERSION_INT] -ge 52066100; then
+ FFMPEG_VERSION="2.2"
+ elif test $[$1][_VERSION_INT] -ge 52048100; then
FFMPEG_VERSION="2.1"
elif test $[$1][_VERSION_INT] -ge 52038100; then
FFMPEG_VERSION="2.0"