aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2013-12-23 11:41:37 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2013-12-23 11:41:37 +0000
commit0db4e66aeb757933009b201295d474943da03dfd (patch)
tree2ddbd576baf35eef128de53a86e8cf4decc379c6
parenta877fedebf9bfdbeab9fe806123b5385ee53bb66 (diff)
downloadusdx-0db4e66aeb757933009b201295d474943da03dfd.tar.gz
usdx-0db4e66aeb757933009b201295d474943da03dfd.tar.xz
usdx-0db4e66aeb757933009b201295d474943da03dfd.zip
add version of libavutil for the detection of the ffmpeg version
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3044 b956fd51-792f-4845-bead-9b4dfca2ff2c
-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 eba41565..26e2af18 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 52038100; then
+ if test $[$1][_VERSION_INT] -ge 52048100; then
+ FFMPEG_VERSION="2.1"
+ elif test $[$1][_VERSION_INT] -ge 52038100; then
FFMPEG_VERSION="2.0"
elif test $[$1][_VERSION_INT] -ge 52018100; then
FFMPEG_VERSION="1.2"