diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-04-20 19:54:15 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-04-20 19:54:15 +0000 |
| commit | 170917432bdc4e1c52d0fe7ac9bf539cacc2f5f8 (patch) | |
| tree | a3777f7cc3680b76d298a520a407170ef8143285 /dists/autogen | |
| parent | 9bc840d97697bc6445aab17368bad58d02018a2a (diff) | |
| download | usdx-170917432bdc4e1c52d0fe7ac9bf539cacc2f5f8.tar.gz usdx-170917432bdc4e1c52d0fe7ac9bf539cacc2f5f8.tar.xz usdx-170917432bdc4e1c52d0fe7ac9bf539cacc2f5f8.zip | |
new detection of ffmpeg version. API changes: SampleFormat -> AVSampleFormat. Configure still needs update. Special thanks to lotan.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2856 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'dists/autogen')
| -rw-r--r-- | dists/autogen/m4/pkg_config_utils.m4 | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/dists/autogen/m4/pkg_config_utils.m4 b/dists/autogen/m4/pkg_config_utils.m4 index 903e0fc9..df0b2e49 100644 --- a/dists/autogen/m4/pkg_config_utils.m4 +++ b/dists/autogen/m4/pkg_config_utils.m4 @@ -96,8 +96,30 @@ AC_DEFUN([PKG_VERSION], [$1][_VERSION]="0.0.0" fi AX_EXTRACT_VERSION([$1], $[$1][_VERSION]) -]) + # for avutil: map library version to ffmpeg version + if test $1 = "libavutil"; then + AC_MSG_CHECKING([version of ffmpeg]) + if test $[$1][_VERSION_INT] -le 51035100; then + if test $[$1][_VERSION_INT] -ge 51034101; then + FFMPEG_VERSION="0.10" + elif test $[$1][_VERSION_INT] -ge 51032000; then + FFMPEG_VERSION="0.9" + elif test $[$1][_VERSION_INT] -ge 51009001; then + FFMPEG_VERSION="0.8" + elif test $[$1][_VERSION_INT] -ge 50043000; then + FFMPEG_VERSION="0.7" + else + FFMPEG_VERSION="0" + fi + else + FFMPEG_VERSION="0" + fi + AX_EXTRACT_VERSION(FFMPEG, $FFMPEG_VERSION) + AC_SUBST(FFMPEG_VERSION) + AC_MSG_RESULT(@<:@$FFMPEG_VERSION@:>@) + fi +]) # SYNOPSIS # |