Merge commit 'ce364088ef53dbaf90e74a471d12b732b697e0cd' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 15:24:19 +0000 (17:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 15:24:43 +0000 (17:24 +0200)
* commit 'ce364088ef53dbaf90e74a471d12b732b697e0cd':
  configure: Support older version of openjpeg1

Conflicts:
configure

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

Trivial merge