diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-10 23:00:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-10 23:00:55 +0100 |
| commit | 182c674f68139f5613147fd9e0a7f196dc9c8bea (patch) | |
| tree | 4db94943fcf0b9c3efaba7d3376b497f49740579 /libavformat/hevc.c | |
| parent | b73cf4eb1561838c324eb3862a71ae3cdc0f6899 (diff) | |
| parent | 4a8562394b685e83ae4a38a93eef43625755a231 (diff) | |
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>
Diffstat (limited to 'libavformat/hevc.c')
0 files changed, 0 insertions, 0 deletions