[FFmpeg-cvslog] j2kdec: cdxy != 1 does not work, print an error

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 27 14:50:04 2013 +0200| [2c5a5c5a623d7905ce2ebc59a6762582945534ec] | committer: Michael Niedermayer

j2kdec: cdxy != 1 does not work, print an error

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

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

 libavcodec/j2kdec.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c
index 41b109a..656ee38 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);