diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 17:20:37 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 17:20:37 +0400 |
commit | 11cf4b72475f70a35d78b04e3b21d295c2da8a1d (patch) | |
tree | faf09b9f98d831beab3df7ee9bdc10279502d0fa /libavcodec/jpeg2000dec.c | |
parent | c7a092cb2d573535dbc26e93a1664f3db39df47c (diff) | |
parent | f9581f1414ec8e3e7d0868793cda4f2e4fa113ea (diff) |
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/jpeg2000dec.c')
-rw-r--r-- | libavcodec/jpeg2000dec.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 8b19f8b41e..f45e609c20 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -86,7 +86,6 @@ typedef struct Jpeg2000DecoderContext { Jpeg2000Tile *tile; /*options parameters*/ - int lowres; int reduction_factor; } Jpeg2000DecoderContext; @@ -1121,7 +1120,6 @@ static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, cblk->coord[1][1] - cblk->coord[1][0], bandpos); - /* Manage band offsets */ x = cblk->coord[0][0]; y = cblk->coord[1][0]; @@ -1396,9 +1394,6 @@ static int jpeg2000_decode_frame(AVCodecContext *avctx, void *data, bytestream2_init(&s->g, avpkt->data, avpkt->size); s->curtileno = -1; - // reduction factor, i.e number of resolution levels to skip - s->reduction_factor = s->lowres; - if (bytestream2_get_bytes_left(&s->g) < 2) { ret = AVERROR_INVALIDDATA; goto end; @@ -1463,7 +1458,7 @@ static void jpeg2000_init_static_data(AVCodec *codec) static const AVOption options[] = { { "lowres", "Lower the decoding resolution by a power of two", - OFFSET(lowres), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, JPEG2000_MAX_RESLEVELS - 1, VD }, + OFFSET(reduction_factor), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, JPEG2000_MAX_RESLEVELS - 1, VD }, { NULL }, }; |