Merge commit 'ca14a2d0e40720d018421e06995737e5682c33c9' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 15:23:39 +0000 (17:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 15:23:59 +0000 (17:23 +0200)
* commit 'ca14a2d0e40720d018421e06995737e5682c33c9':
  configure: Use the right pkgconf file for openjpeg

Conflicts:
configure

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

Trivial merge