Merge commit 'a331e11906b196c9a00f5ffbc45d80fcd7fe8423' into release/0.10

* commit 'a331e11906b196c9a00f5ffbc45d80fcd7fe8423': smc: fix the bounds check Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-11 22:31:54 +01:00 · 2015-03-11 22:31:54 +01:00 · ed69f0f72e
commit ed69f0f72e
parent 8439378f41 a331e11906
1 changed files with 1 additions and 1 deletions
--- 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; \