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

[Michael Niedermayer]

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

Merge commit 'f2693e98b449592ec0ed4979220814bf54e60a16' into release/2.2

* commit 'f2693e98b449592ec0ed4979220814bf54e60a16':
  build: Use pkg-config for openjpeg

Conflicts:
	configure

Not merged / merge just for metadata at request of carl

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

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