j2kdec: dont fail on non zero cblock style.
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Jun 2011 17:34:43 +0000 (19:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Jun 2011 17:41:15 +0000 (19:41 +0200)
This allows decoding to continue a bit further for some files.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/j2kdec.c

index 3156e90..2497a2e 100644 (file)
@@ -285,8 +285,7 @@ static int get_cox(J2kDecoderContext *s, J2kCodingStyle *c)
 
     c->cblk_style = bytestream_get_byte(&s->buf);
     if (c->cblk_style != 0){ // cblk style
-        av_log(s->avctx, AV_LOG_ERROR, "no extra cblk styles supported\n");
-        return -1;
+        av_log(s->avctx, AV_LOG_WARNING, "extra cblk styles %X\n", c->cblk_style);
     }
     c->transform = bytestream_get_byte(&s->buf); // transformation
     if (c->csty & J2K_CSTY_PREC) {