diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 03:32:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 03:32:00 +0100 |
| commit | 1abb03195930163ba2c5850599c1380bd8b09c58 (patch) | |
| tree | d3139f76107972de60b78215fc0c8e643f39d877 /libswscale | |
| parent | 802e5fc8f811fb0e1f23d3e12841d3134d67202e (diff) | |
| parent | 0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1 (diff) | |
| download | ffmpeg-1abb03195930163ba2c5850599c1380bd8b09c58.tar.gz | |
Merge commit '0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1'
* commit '0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1':
configure: Always use -DOPJ_STATIC when checking for openjpeg
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions