diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 14:30:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 14:30:17 +0200 |
| commit | 2cad1ea29e4df69a556a95e942968184493fb249 (patch) | |
| tree | 001ddee58f322d8050c42e66b52ac17c72db8aea /libavcodec/jpeg2000dec.c | |
| parent | db5c93a1a97d3b6919d70bce65d09dc53be708f8 (diff) | |
| parent | 17e5d614a8647d51b9795cb8bccf97ee33ca2d58 (diff) | |
Merge commit '17e5d614a8647d51b9795cb8bccf97ee33ca2d58'
* commit '17e5d614a8647d51b9795cb8bccf97ee33ca2d58':
jpeg2000: Check zero bit-plane validity
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeg2000dec.c')
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 0e459c1f7c..ecd14c2904 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -659,10 +659,10 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, if (!cblk->npasses) { int v = expn[bandno] + numgbits - 1 - - tag_tree_decode(s, prec->zerobits + cblkno, - 100); + tag_tree_decode(s, prec->zerobits + cblkno, 100); if (v < 0) { - av_log(s->avctx, AV_LOG_ERROR, "nonzerobits %d invalid\n", v); + av_log(s->avctx, AV_LOG_ERROR, + "nonzerobits %d invalid\n", v); return AVERROR_INVALIDDATA; } cblk->nonzerobits = v; |