diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-03 22:50:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-03 23:03:19 +0100 |
| commit | cba3a46e936cca55d37bebf2e6b381c9a7c5d372 (patch) | |
| tree | 4b66477fdc164ca1a9be4a4dca3347bc347f5f89 /libavcodec/svq1dec.c | |
| parent | acfb4ede2f6b59963381c469fe002c44132f02e6 (diff) | |
| parent | 9b8c8a9395c849639aea0f6b5300e991e93c3a73 (diff) | |
| download | ffmpeg-cba3a46e936cca55d37bebf2e6b381c9a7c5d372.tar.gz | |
Merge commit '9b8c8a9395c849639aea0f6b5300e991e93c3a73'
* commit '9b8c8a9395c849639aea0f6b5300e991e93c3a73':
svq1dec: Validate the stages value strictly
Not merged, this is wrong, the condition is not possible
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/svq1dec.c')
| -rw-r--r-- | libavcodec/svq1dec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index 7c31e570e5..94846538fc 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -187,7 +187,7 @@ static int svq1_decode_block_intra(GetBitContext *bitbuf, uint8_t *pixels, continue; /* skip vector */ } - if (stages > 0 && level >= 4) { + if ((stages > 0 && level >= 4)) { av_dlog(NULL, "Error (svq1_decode_block_intra): invalid vector: stages=%i level=%i\n", stages, level); @@ -249,7 +249,7 @@ static int svq1_decode_block_non_intra(GetBitContext *bitbuf, uint8_t *pixels, if (stages == -1) continue; /* skip vector */ - if ((stages > 0) && (level >= 4)) { + if ((stages > 0 && level >= 4)) { av_dlog(NULL, "Error (svq1_decode_block_non_intra): invalid vector: stages=%i level=%i\n", stages, level); |