OSDN Git Service

Merge commit '4a8562394b685e83ae4a38a93eef43625755a231'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Mar 2014 22:00:55 +0000 (23:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Mar 2014 22:00:55 +0000 (23:00 +0100)
commit182c674f68139f5613147fd9e0a7f196dc9c8bea
tree4db94943fcf0b9c3efaba7d3376b497f49740579
parentb73cf4eb1561838c324eb3862a71ae3cdc0f6899
parent4a8562394b685e83ae4a38a93eef43625755a231
Merge commit '4a8562394b685e83ae4a38a93eef43625755a231'

* commit '4a8562394b685e83ae4a38a93eef43625755a231':
  configure: Use the right pkgconf file for openjpeg

Conflicts:
configure

No change as the incorrect code wasnt in ffmpegs configure

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