[FFmpeg-cvslog] Merge commit 'ce364088ef53dbaf90e74a471d12b732b697e0cd' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 17:24:19 2014 +0200| [a68d4f55debc1775f65313bd65ce78f0f773b7e1] | committer: Michael Niedermayer

Merge commit 'ce364088ef53dbaf90e74a471d12b732b697e0cd' into release/1.1

* commit 'ce364088ef53dbaf90e74a471d12b732b697e0cd':
  configure: Support older version of openjpeg1

Conflicts:
	configure

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

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