diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:21:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:21:18 +0100 |
| commit | 80122a3af3712e9d62d8f09c2386d620b1402a79 (patch) | |
| tree | 18288e9d6f64a39df0117293d387552be6e84bae /libavcodec/adpcmenc.c | |
| parent | a475755b3ad600ff50cc1d6f0cf803d14ce6cc40 (diff) | |
| parent | f2693e98b449592ec0ed4979220814bf54e60a16 (diff) | |
| download | ffmpeg-80122a3af3712e9d62d8f09c2386d620b1402a79.tar.gz | |
Merge commit 'f2693e98b449592ec0ed4979220814bf54e60a16' into release/2.2
* commit 'f2693e98b449592ec0ed4979220814bf54e60a16':
build: Use pkg-config for openjpeg
Conflicts:
configure
Not merged / merge just for metadata at request of carl
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcmenc.c')
0 files changed, 0 insertions, 0 deletions