aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-27 14:50:04 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-27 15:13:18 +0200
commit2c5a5c5a623d7905ce2ebc59a6762582945534ec (patch)
treecef80e2f04c27b261ec836afb4b69e6620dab2f1 /libavcodec
parent14652c080dc3b7f3abc801d575acb52122be0137 (diff)
downloadffmpeg-2c5a5c5a623d7905ce2ebc59a6762582945534ec.tar.gz
j2kdec: cdxy != 1 does not work, print an error
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/j2kdec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c
index 41b109a6c9..656ee38be8 100644
--- a/libavcodec/j2kdec.c
+++ b/libavcodec/j2kdec.c
@@ -175,6 +175,9 @@ static int get_siz(Jpeg2000DecoderContext *s)
s->sgnd[i] = !!(x & 0x80);
s->cdx[i] = bytestream2_get_byteu(&s->g);
s->cdy[i] = bytestream2_get_byteu(&s->g);
+ if (s->cdx[i] != 1 || s->cdy[i] != 1) {
+ av_log(s->avctx, AV_LOG_ERROR, "unsupported/ CDxy values\n");
+ }
}
s->numXtiles = ff_jpeg2000_ceildiv(s->width - s->tile_offset_x, s->tile_width);