diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 22:31:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 22:31:57 +0100 |
| commit | ed69f0f72edb0d84e8bf27e0c000eb36dce5184c (patch) | |
| tree | a1e369eb4d9da9d78598e38d9477bb929c339d9a | |
| parent | 8439378f41e34737499858eff8bafb930aee50ca (diff) | |
| parent | a331e11906b196c9a00f5ffbc45d80fcd7fe8423 (diff) | |
| download | ffmpeg-ed69f0f72edb0d84e8bf27e0c000eb36dce5184c.tar.gz | |
Merge commit 'a331e11906b196c9a00f5ffbc45d80fcd7fe8423' into release/0.10
* commit 'a331e11906b196c9a00f5ffbc45d80fcd7fe8423':
smc: fix the bounds check
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 3cd5e53f5f..f65cbc66a9 100644 --- a/libavcodec/smc.c +++ b/libavcodec/smc.c @@ -69,7 +69,7 @@ typedef struct SmcContext { row_ptr += stride * 4; \ } \ total_blocks--; \ - if (total_blocks < 0) \ + if (total_blocks < !!n_blocks) \ { \ av_log(s->avctx, AV_LOG_INFO, "warning: block counter just went negative (this should not happen)\n"); \ return; \ |