diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 15:03:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 15:03:08 +0200 |
| commit | c7a092cb2d573535dbc26e93a1664f3db39df47c (patch) | |
| tree | fea41a0057e6918be4db132857f4814e28075c55 /arch.mak | |
| parent | 273f600b037ccf166e5540bc6e8e13d3bf738aa9 (diff) | |
| parent | 4cbd5ed11b0161a6a192174934b241e0cc0599a9 (diff) | |
| download | ffmpeg-c7a092cb2d573535dbc26e93a1664f3db39df47c.tar.gz | |
Merge commit '4cbd5ed11b0161a6a192174934b241e0cc0599a9'
* commit '4cbd5ed11b0161a6a192174934b241e0cc0599a9':
jpeg2000: Fix compute precedence error in lut_gain index
jpeg2000: Initialize code blocks structures in precincts to 0
jpeg2000: Check that we have enough components for MCT
Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'arch.mak')
0 files changed, 0 insertions, 0 deletions