diff options
| author | brian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2016-02-14 19:01:18 +0000 |
|---|---|---|
| committer | brian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2016-02-14 19:01:18 +0000 |
| commit | feec4935253e623bc17f1eab774b7ed3b94126a1 (patch) | |
| tree | c9b5355da9475c1c59241cadf8bfbceea2eb98f4 /configure | |
| parent | 64fdc1d7a04550ee9d004081b0eceb424ba23d06 (diff) | |
| download | usdx-feec4935253e623bc17f1eab774b7ed3b94126a1.tar.gz usdx-feec4935253e623bc17f1eab774b7ed3b94126a1.tar.xz usdx-feec4935253e623bc17f1eab774b7ed3b94126a1.zip | |
Another attempt at fixing the swresample search, should fix the buildbot compilationHEADsvn/trunkmastergithub/svn/trunk
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3196 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -7130,7 +7130,7 @@ $as_echo "[$FFMPEG_VERSION]" >&6; } # the first swresample header translation was in ffmpeg 2.1 (avutil 52.48.100) if [ "$libavutil_VERSION_MAJOR" -gt 52 ] || ([ "$libavutil_VERSION_MAJOR" -eq 52 ] && [ "$libavutil_VERSION_MINOR" -ge 48 ]); then - # find FFMpeg's swresample lib (just if FFMpeg is compiled in GPL mode) + # find FFMpeg's swresample lib (just if FFMpeg is compiled in GPL mode) have_lib="no" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libswresample" >&5 @@ -7363,6 +7363,14 @@ $as_echo "[$FFMPEG_VERSION]" >&6; } fi +else + + if [ xxno = xyes ]; then + DEFINE_HAVE_SWRESAMPLE=DEFINE + else + DEFINE_HAVE_SWRESAMPLE=UNDEF + fi + fi |