diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-29 00:27:45 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-29 00:28:23 +0200 |
commit | 621d4089a4cff0066d5cfc006cf20d99414ee9f9 (patch) | |
tree | df4b7bce78139e30b42ace69d91cd9e13ff9e807 /libswresample/swresampleres.rc | |
parent | 8b1e920676f6eeeb01422660768f5f92b3811bc6 (diff) | |
parent | e4a462e3eafdfe336f4d079c3ba72a9cdb4748b0 (diff) | |
download | ffmpeg-621d4089a4cff0066d5cfc006cf20d99414ee9f9.tar.gz |
Merge commit 'e4a462e3eafdfe336f4d079c3ba72a9cdb4748b0'
* commit 'e4a462e3eafdfe336f4d079c3ba72a9cdb4748b0':
configure: Use require_pkg_config for Speex
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/swresampleres.rc')
0 files changed, 0 insertions, 0 deletions