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)
* 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>

Trivial merge