diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 15:15:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-21 20:43:38 +0200 |
| commit | bf2254bffd50d4bfcd5bb1373662d72fedc2f54c (patch) | |
| tree | 49935598008a39f702bb1e8cc2612488175f2e73 /libavcodec | |
| parent | 2cab5f4ad05098c007b0468d80ede59b8360dfa8 (diff) | |
| download | ffmpeg-bf2254bffd50d4bfcd5bb1373662d72fedc2f54c.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>
Diffstat (limited to 'libavcodec')
| -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 17ee5418c0..555b3e962d 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; } } |