diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 17:23:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 17:23:59 +0200 |
| commit | fdcdfb36b74b3ae3cc2f2d6db4d3255d91dcd178 (patch) | |
| tree | 7b8d43007d98f84b28b951297369d6dd2217180b /doc/examples/decoding_encoding.c | |
| parent | 238360665b26e7bc599ffb9b18d8463e84feb8e1 (diff) | |
| parent | ca14a2d0e40720d018421e06995737e5682c33c9 (diff) | |
| download | ffmpeg-fdcdfb36b74b3ae3cc2f2d6db4d3255d91dcd178.tar.gz | |
Merge commit 'ca14a2d0e40720d018421e06995737e5682c33c9' into release/1.1
* commit 'ca14a2d0e40720d018421e06995737e5682c33c9':
configure: Use the right pkgconf file for openjpeg
Conflicts:
configure
See: 182c674f68139f5613147fd9e0a7f196dc9c8bea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/decoding_encoding.c')
0 files changed, 0 insertions, 0 deletions