Changeset c7d444a


Ignore:
Timestamp:
Mar 17, 2017, 10:32:22 AM (3 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/pydocstrings, feature/timestretch, master, sampler
Children:
8177483, bad88364, bdf7caf
Parents:
4f64069
Message:

python/lib/moresetuptools.py: check for libswresample, prefer to libavresample

File:
1 edited

Legend:

Unmodified
Added
Removed
  • python/lib/moresetuptools.py

    r4f64069 rc7d444a  
    113113    # loof for additional packages
    114114    print("Info: looking for *optional* additional packages")
    115     packages = ['libavcodec', 'libavformat', 'libavutil', 'libavresample',
     115    packages = ['libavcodec', 'libavformat', 'libavutil',
     116                'libswresample', 'libavresample',
    116117                'sndfile',
    117118                #'fftw3f',
     
    125126    if 'avcodec' in ext.libraries \
    126127            and 'avformat' in ext.libraries \
    127             and 'avutil' in ext.libraries \
    128             and 'avresample' in ext.libraries:
    129         ext.define_macros += [('HAVE_LIBAV', 1)]
     128            and 'avutil' in ext.libraries:
     129        if 'swresample' in ext.libraries:
     130            ext.define_macros += [('HAVE_SWRESAMPLE', 1)]
     131        elif 'avresample' in ext.libraries:
     132            ext.define_macros += [('HAVE_AVRESAMPLE', 1)]
     133        if 'swresample' in ext.libraries or 'avresample' in ext.libraries:
     134            ext.define_macros += [('HAVE_LIBAV', 1)]
    130135    if 'sndfile' in ext.libraries:
    131136        ext.define_macros += [('HAVE_SNDFILE', 1)]
Note: See TracChangeset for help on using the changeset viewer.