diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 12:32:08 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 12:32:08 +0100 |
| commit | 985bc8b49683761e5014a22146d4346c951680ad (patch) | |
| tree | 8ec2c827600cc462da1257ae8953986c5036fbff /libavcodec/ffjni.h | |
| parent | bebab21176c1f052f748cfb2384cc01e0bdb13f4 (diff) | |
| parent | 6c445990e64124ad64c79423dfd3764520648c89 (diff) | |
| download | ffmpeg-985bc8b49683761e5014a22146d4346c951680ad.tar.gz | |
Merge commit '6c445990e64124ad64c79423dfd3764520648c89'
* commit '6c445990e64124ad64c79423dfd3764520648c89':
tiffenc: Check zlib support for deflate option during initialization
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/ffjni.h')
0 files changed, 0 insertions, 0 deletions