diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-08 16:48:22 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-08 16:48:27 +0100 |
commit | 8418de295a9a202e940355b882c35f69c02b9b02 (patch) | |
tree | 5505d12ec0961c0af239a40d9674ed7524e9e03f /libavutil | |
parent | e59fe789581324ac48b669caed0ac61fa05902a2 (diff) | |
parent | cea57b7fe05bea6a8935082d03eb1974c8a06e37 (diff) | |
download | ffmpeg-8418de295a9a202e940355b882c35f69c02b9b02.tar.gz |
Merge remote-tracking branch 'TimothyGu/release/1.0' into release/1.0
* TimothyGu/release/1.0:
configure: use pkg-config to detect libbluray
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
0 files changed, 0 insertions, 0 deletions