From c78f3e55717013f8092423b476806607108f7401 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 26 May 2013 13:33:10 +0200 Subject: [PATCH] j2kdec: prog_order reading from jpeg2000dec Signed-off-by: Michael Niedermayer --- libavcodec/j2kdec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c index f4b7e3e88b..c9322a5b71 100644 --- a/libavcodec/j2kdec.c +++ b/libavcodec/j2kdec.c @@ -330,9 +330,10 @@ static int get_cod(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c, uint8_t *p tmp.csty = bytestream2_get_byteu(&s->g); - if (bytestream2_get_byteu(&s->g)){ // progression level + // get progression order + tmp.prog_order = bytestream_get_byte(&s->g); + if (tmp.prog_order){ av_log(s->avctx, AV_LOG_ERROR, "only LRCP progression supported\n"); - return -1; } tmp.nlayers = bytestream2_get_be16u(&s->g);