diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 15:15:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-10 02:13:11 +0200 |
| commit | 32f568f82c46cd8cf897b118b146c15271c0081f (patch) | |
| tree | bbe7e959f1479aadbb2b9205073d75ee3dd1e569 | |
| parent | 0bf455c0543dca474088e3ef004904a747555bec (diff) | |
| download | ffmpeg-32f568f82c46cd8cf897b118b146c15271c0081f.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 5231040494..a88bfeaebe 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1601,7 +1601,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; atom_size -= 6; atom2_size -= 6; |