diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-08 16:21:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-08 16:22:03 +0100 |
| commit | aa3378b579f2835c122b6f89bddb5eb8f9da3fa2 (patch) | |
| tree | edbedc697269a6cb8dd528761db3ffdaa172b7dd /ffplay.c | |
| parent | bc07ec7b2f97377c84be046d4e5b057b39486a95 (diff) | |
| parent | 2a45007f3408176a7578fb3896a560b5fc4c2a96 (diff) | |
| download | ffmpeg-aa3378b579f2835c122b6f89bddb5eb8f9da3fa2.tar.gz | |
Merge remote-tracking branch 'TimothyGu/release/0.11' into release/0.11
* TimothyGu/release/0.11:
configure: use pkg-config to detect libbluray
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions