From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 26 May 2013 11:33:10 +0000 (+0200)
Subject: j2kdec: prog_order reading from jpeg2000dec
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=c78f3e55717013f8092423b476806607108f7401;p=ffmpeg

j2kdec: prog_order reading from jpeg2000dec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c
index f4b7e3e88b0..c9322a5b71f 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);