diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 15:20:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 15:20:37 +0200 |
| commit | 11cf4b72475f70a35d78b04e3b21d295c2da8a1d (patch) | |
| tree | faf09b9f98d831beab3df7ee9bdc10279502d0fa /libavcodec/amrwbdec.c | |
| parent | c7a092cb2d573535dbc26e93a1664f3db39df47c (diff) | |
| parent | f9581f1414ec8e3e7d0868793cda4f2e4fa113ea (diff) | |
| download | ffmpeg-11cf4b72475f70a35d78b04e3b21d295c2da8a1d.tar.gz | |
Merge commit 'f9581f1414ec8e3e7d0868793cda4f2e4fa113ea'
* commit 'f9581f1414ec8e3e7d0868793cda4f2e4fa113ea':
jpeg2000: Improve reduced resolution decoding
jpeg2000: Compute quantization for 'scalar derived' in the correct case.
jpeg2000: Calculate code-block coord in ff_jpeg2000_init_component()
Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/amrwbdec.c')
0 files changed, 0 insertions, 0 deletions