diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-20 12:20:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-20 12:20:46 +0100 |
| commit | b86c2640f65444981718d74dedb85a249d66435c (patch) | |
| tree | 16ad29ed0c4b1884da897d060f5a87939b3c1832 | |
| parent | 9b9411c1cf97da1eeb8a1f09281ed7455590beb3 (diff) | |
| parent | 58dc526ebf722d33bf09275c1241674e0e6b9ef1 (diff) | |
| download | ffmpeg-b86c2640f65444981718d74dedb85a249d66435c.tar.gz | |
Merge commit '58dc526ebf722d33bf09275c1241674e0e6b9ef1' into release/2.4
* commit '58dc526ebf722d33bf09275c1241674e0e6b9ef1':
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 01271b308c..131300a595 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; \ |