Merge commit 'aa807425395caa17a85ed2833133278e8bd44a76'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 20:45:02 +0000 (21:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 20:45:02 +0000 (21:45 +0100)
* commit 'aa807425395caa17a85ed2833133278e8bd44a76':
  configure: Support older version of openjpeg1

Conflicts:
configure

Not merged as the problematic pkg config code wasnt merged

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

Trivial merge