diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 04:35:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 04:35:19 +0100 |
| commit | c633427e927e1247f6beda4193c4fb9ed1c4440a (patch) | |
| tree | 9a36d66ddf0acc8b3239d93f24889b013617bf90 | |
| parent | 0ee7505e63b01b4f1feeb021cc5306dc08b57dc5 (diff) | |
| parent | 306ee95088243fefa2dfcb5c355d439db75e2d2a (diff) | |
| download | ffmpeg-c633427e927e1247f6beda4193c4fb9ed1c4440a.tar.gz | |
Merge commit '306ee95088243fefa2dfcb5c355d439db75e2d2a' into release/1.1
* commit '306ee95088243fefa2dfcb5c355d439db75e2d2a':
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 6294f09691..21e1fb4e7e 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; \ |