diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 15:15:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-15 10:04:51 +0200 |
| commit | f43fb74ad487d0e6797b715bd274906c9bf2e464 (patch) | |
| tree | b1483682450b62341b930a683b87b8538970296d | |
| parent | 0463e9d6da705fdcdbb1fc70a1fe39f13a33c02e (diff) | |
| download | ffmpeg-f43fb74ad487d0e6797b715bd274906c9bf2e464.tar.gz | |
avcodec/jpeg2000dec: fix boolean operator
Fixes CID1271791 #7-6
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f8f155a18ac454e7ff3312e0e0c3a70eb4359143)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index ecb6393f27..1b441a5b0c 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1559,7 +1559,7 @@ static int jp2_find_codestream(Jpeg2000DecoderContext *s) int cn = bytestream2_get_be16(&s->g); int av_unused typ = bytestream2_get_be16(&s->g); int asoc = bytestream2_get_be16(&s->g); - if (cn < 4 || asoc < 4) + if (cn < 4 && asoc < 4) s->cdef[cn] = asoc; } } |