diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 16:46:10 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 16:46:10 +0400 |
| commit | 9dfa5ea5dcc8171e4465fd90df56b5c199dbae49 (patch) | |
| tree | beb126aed78bdb30654f1bb58a672cc0c7ba95e9 /libavcodec/jpeg2000dec.c | |
| parent | a4a16821d7326a6a62c6ac3d9fc8b3d8f111cefc (diff) | |
| parent | 86a2602e16171ddc10c3ec655c23b16ffa595059 (diff) | |
Merge commit '86a2602e16171ddc10c3ec655c23b16ffa595059'
* commit '86a2602e16171ddc10c3ec655c23b16ffa595059':
jpeg2000: Drop unused and writeonly fields
jpeg2000: Correctly calculate sgnd
Conflicts:
libavcodec/jpeg2000.h
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeg2000dec.c')
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 0856beca94..c486dc2d33 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -646,7 +646,6 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, if (band->coord[0][0] == band->coord[0][1] || band->coord[1][0] == band->coord[1][1]) continue; - nb_code_blocks = prec->nb_codeblocks_height * prec->nb_codeblocks_width; for (cblkno = 0; cblkno < nb_code_blocks; cblkno++) { |