diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-20 13:15:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-20 13:15:36 +0100 |
| commit | c52c9f534e6aaa85c7cc0fe078512751002dfa98 (patch) | |
| tree | 56439ecdf9d0a03d7a6e7315c73f9ef75ca47998 | |
| parent | 0d31a01d3a5c8f52286e9d4ec359542a6faa79f7 (diff) | |
| parent | f249e9889155599ee3ad0172832d38f68b0c625d (diff) | |
| download | ffmpeg-c52c9f534e6aaa85c7cc0fe078512751002dfa98.tar.gz | |
Merge commit 'f249e9889155599ee3ad0172832d38f68b0c625d' into release/2.2
* commit 'f249e9889155599ee3ad0172832d38f68b0c625d':
smc: fix the bounds check
Conflicts:
libavcodec/smc.c
See: c727401aa9d62335e89d118a5b4e202edf39d905
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/smc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/smc.c b/libavcodec/smc.c index 791612ebd4..ffc0824b1a 100644 --- a/libavcodec/smc.c +++ b/libavcodec/smc.c @@ -70,7 +70,7 @@ typedef struct SmcContext { row_ptr += stride * 4; \ } \ total_blocks--; \ - if (total_blocks < 0 + !!n_blocks) \ + if (total_blocks < !!n_blocks) \ { \ av_log(s->avctx, AV_LOG_INFO, "warning: block counter just went negative (this should not happen)\n"); \ return; \ |