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)
commitbb40f8f5e22c0c4097a704fdd6e7a66b96f0318d
tree7cb169627c6dbcaf26b80700c91363342312af3e
parentad8bf22086e2e4c62b69166456a7a3b08db7a2a5
parent2c5e1d0933facc20c6926a788cce05d3e6cad149
Merge commit '2c5e1d0933facc20c6926a788cce05d3e6cad149' into release/2.2

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