diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 13:13:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 13:13:13 +0100 |
| commit | bb40f8f5e22c0c4097a704fdd6e7a66b96f0318d (patch) | |
| tree | 7cb169627c6dbcaf26b80700c91363342312af3e /tests/audiogen.c | |
| parent | ad8bf22086e2e4c62b69166456a7a3b08db7a2a5 (diff) | |
| parent | 2c5e1d0933facc20c6926a788cce05d3e6cad149 (diff) | |
| download | ffmpeg-bb40f8f5e22c0c4097a704fdd6e7a66b96f0318d.tar.gz | |
Merge commit '2c5e1d0933facc20c6926a788cce05d3e6cad149' into release/2.2
* commit '2c5e1d0933facc20c6926a788cce05d3e6cad149':
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 'tests/audiogen.c')
0 files changed, 0 insertions, 0 deletions