diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 16:26:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 16:26:54 +0200 |
| commit | 47e18e2e03c92a9e344e98c021021248408754db (patch) | |
| tree | 231964ab48de431d06fe2a09428adc757c73079e /libavcodec/adpcm.h | |
| parent | 0162ad1a59976b6b63fc241186336faa4a0a023d (diff) | |
| parent | 1bccf68caeee787139f22679e1300a5eea048cf5 (diff) | |
| download | ffmpeg-47e18e2e03c92a9e344e98c021021248408754db.tar.gz | |
Merge commit '1bccf68caeee787139f22679e1300a5eea048cf5' into release/1.1
* commit '1bccf68caeee787139f22679e1300a5eea048cf5':
build: Use pkg-config for openjpeg
Conflicts:
configure
See: 9c99bc1f3fb974f07bc9b565dad00d0e162a09c1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcm.h')
0 files changed, 0 insertions, 0 deletions