Merge commit 'b920c1d' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Mar 2014 01:58:37 +0000 (02:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Mar 2014 01:58:57 +0000 (02:58 +0100)
commiteac281b06c453c0af0ffc2a8fb72f976abe583cb
treedf7c58ed9711ab510af90b10a4974bae60893c44
parent6ba07e9948d5c9bcb7a0f270f150fbb2f99074e1
parentb920c1d5ad5cfe74c95b0eaec0e69b074ee9b4c1
Merge commit 'b920c1d' into release/2.2

* commit 'b920c1d':
  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>