Merge remote-tracking branch 'TimothyGu/release/1.2' into release/1.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Mar 2014 12:15:37 +0000 (13:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Mar 2014 12:15:42 +0000 (13:15 +0100)
commit6ee47bd008ffb1442362fd5e8d3b34f079c23de5
treeb7824315f515b7297c3d424eb603069601f107dc
parent78197501572abbad33d7458f5009c5f53ecf021a
parent0d819ed318ded6e7acdebced7da2e6411caa0fd6
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>