[FFmpeg-cvslog] Merge commit '2c5e1d0933facc20c6926a788cce05d3e6cad149' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 11 13:13:13 2014 +0100| [bb40f8f5e22c0c4097a704fdd6e7a66b96f0318d] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb40f8f5e22c0c4097a704fdd6e7a66b96f0318d
---