diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-16 04:01:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-16 04:01:24 +0100 |
| commit | 28ba1027ec1dea1a55f9e940779f75417ce4798d (patch) | |
| tree | fb1b3486384c9758c5d9e52697b54099edd83958 /libavcodec/j2k.c | |
| parent | 7606825350a64ad1c2365a74cac8a5e586f39ff6 (diff) | |
| parent | d1ea26f6407e8bf52da1e36a99c4d9bbb14fb1fb (diff) | |
| download | ffmpeg-28ba1027ec1dea1a55f9e940779f75417ce4798d.tar.gz | |
Merge remote-tracking branch 'shariman/wmall'
* shariman/wmall:
Do not try to read residue if ave_mean <= 1
Move some variable declarations to comply with C90
Cosmetics: fix some whitespace errors
Support 24-bit decoding
wmall: remove ;;
Conflicts:
libavcodec/wmalosslessdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/j2k.c')
0 files changed, 0 insertions, 0 deletions