[FFmpeg-cvslog] j2kdec: dont fail on non zero cblock style.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun  3 19:34:43 2011 +0200| [c1daf0723c49d331deecd63b4a6a328000821950] | committer: Michael Niedermayer

j2kdec: dont fail on non zero cblock style.

This allows decoding to continue a bit further for some files.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c1daf0723c49d331deecd63b4a6a328000821950
---

 libavcodec/j2kdec.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c
index 3156e90..2497a2e 100644
--- a/libavcodec/j2kdec.c
+++ b/libavcodec/j2kdec.c
@@ -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) {