[FFmpeg-cvslog] Merge commit '4a8562394b685e83ae4a38a93eef43625755a231'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 10 23:00:55 2014 +0100| [182c674f68139f5613147fd9e0a7f196dc9c8bea] | committer: Michael Niedermayer

Merge commit '4a8562394b685e83ae4a38a93eef43625755a231'

* commit '4a8562394b685e83ae4a38a93eef43625755a231':
  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=182c674f68139f5613147fd9e0a7f196dc9c8bea
---