diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-10 13:15:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-10 13:15:42 +0100 |
| commit | 6ee47bd008ffb1442362fd5e8d3b34f079c23de5 (patch) | |
| tree | b7824315f515b7297c3d424eb603069601f107dc /tools/qt-faststart.c | |
| parent | 78197501572abbad33d7458f5009c5f53ecf021a (diff) | |
| parent | 0d819ed318ded6e7acdebced7da2e6411caa0fd6 (diff) | |
| download | ffmpeg-6ee47bd008ffb1442362fd5e8d3b34f079c23de5.tar.gz | |
Merge remote-tracking branch 'TimothyGu/release/1.2' into release/1.2
* TimothyGu/release/1.2:
configure: use pkg-config to detect libbluray
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/qt-faststart.c')
0 files changed, 0 insertions, 0 deletions