Merge commit '1bccf68caeee787139f22679e1300a5eea048cf5' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 14:26:32 +0000 (16:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 14:26:54 +0000 (16:26 +0200)
commit47e18e2e03c92a9e344e98c021021248408754db
tree231964ab48de431d06fe2a09428adc757c73079e
parent0162ad1a59976b6b63fc241186336faa4a0a023d
parent1bccf68caeee787139f22679e1300a5eea048cf5
Merge commit '1bccf68caeee787139f22679e1300a5eea048cf5' into release/1.1

* commit '1bccf68caeee787139f22679e1300a5eea048cf5':
  build: Use pkg-config for openjpeg

Conflicts:
configure

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