diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2014-11-22 11:49:39 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2014-11-22 11:49:39 +0000 |
| commit | 3a42880592166db97707282162b84c97a30cf51f (patch) | |
| tree | f58b0935fab23e49290d1e033d7c484c98e721e4 /dists/autogen/m4 | |
| parent | e1b891639d0efe89805587aaaf78c953867fd638 (diff) | |
| download | usdx-3a42880592166db97707282162b84c97a30cf51f.tar.gz usdx-3a42880592166db97707282162b84c97a30cf51f.tar.xz usdx-3a42880592166db97707282162b84c97a30cf51f.zip | |
adding ffmpeg-2.4. compiles, but crashes on Mac OS X.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3083 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'dists/autogen/m4')
| -rw-r--r-- | dists/autogen/m4/pkg_config_utils.m4 | 4 |
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 878d91d6..e26b20ec 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 52066100; then + if test $[$1][_VERSION_INT] -ge 54007001; then + FFMPEG_VERSION="2.4" + elif test $[$1][_VERSION_INT] -ge 52066100; then FFMPEG_VERSION="2.2" elif test $[$1][_VERSION_INT] -ge 52048100; then FFMPEG_VERSION="2.1" |