Merge commit 'd423dd72be451462c6fb1cbbe313bed0194001ab'

* commit 'd423dd72be451462c6fb1cbbe313bed0194001ab': smc: fix the bounds check Conflicts: libavcodec/smc.c See: c727401aa9 Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · c266d0e1bd
parent 8af8833591 d423dd72be
commit c266d0e1bd
1 changed files with 1 additions and 1 deletions
--- 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; \