Merge commit '2c5e1d0933facc20c6926a788cce05d3e6cad149' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 12:13:13 +0000 (13:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 12:13:13 +0000 (13:13 +0100)
* commit '2c5e1d0933facc20c6926a788cce05d3e6cad149':
  configure: Use the right pkgconf file for openjpeg

Conflicts:
configure

No change as the incorrect code wasnt in ffmpegs configure

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

No differences found