diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-04 13:22:49 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-04 13:22:56 +0100 |
commit | c67ddb56da551b5afe536cf0bdc6487ccc80b8ce (patch) | |
tree | 3f013fa98d1cbcdbb94579b2d5e2b33959b09a40 /libavutil/blowfish.h | |
parent | a2bff49e26a9c0bc6caa5ba3b7479df7afe00342 (diff) | |
parent | 60f06f986f81c5aa0497c4fa189f50a504896c81 (diff) | |
download | ffmpeg-c67ddb56da551b5afe536cf0bdc6487ccc80b8ce.tar.gz |
Merge remote-tracking branch 'mjbshaw/master'
* mjbshaw/master:
libopenjpegenc: make dci compliant j2c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/blowfish.h')
0 files changed, 0 insertions, 0 deletions