Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 01:05:03 +0000 (02:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 01:05:03 +0000 (02:05 +0100)
commit9c99bc1f3fb974f07bc9b565dad00d0e162a09c1
tree1681fe1064388270b24908828e35958cc81abce1
parent9827f3db88c0dbcca3070dbd88af131dbcc7e84c
parent0e0cefb22216a4b6684a30a50cb5973400dc59f2
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: Use pkg-config for openjpeg

Conflicts:
configure

Not merged / merge just for metadata at request of carl

Merged-by: Michael Niedermayer <michaelni@gmx.at>