[FFmpeg-cvslog] Merge commit '0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 23 03:32:00 2014 +0100| [1abb03195930163ba2c5850599c1380bd8b09c58] | committer: Michael Niedermayer

Merge commit '0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1'

* commit '0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1':
  configure: Always use -DOPJ_STATIC when checking for openjpeg

Conflicts:
	configure

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

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