aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-06-03 19:34:43 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-06-03 19:41:15 +0200
commitc1daf0723c49d331deecd63b4a6a328000821950 (patch)
tree1c9e335267d9b6de14447964b144a3e02b5b0049 /libavcodec
parent58149303b3e502199bd663c2c107b7a4771bc314 (diff)
downloadffmpeg-c1daf0723c49d331deecd63b4a6a328000821950.tar.gz
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@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/j2kdec.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c
index 3156e90198..2497a2e015 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) {