Merge commit '58dc526ebf722d33bf09275c1241674e0e6b9ef1' into release/2.4

* commit '58dc526ebf722d33bf09275c1241674e0e6b9ef1': smc: fix the bounds check Conflicts: libavcodec/smc.c See: c727401aa9 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-20 12:20:28 +01:00 · 2014-12-20 12:20:28 +01:00 · b86c2640f6
parent 9b9411c1cf 58dc526ebf
commit b86c2640f6
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; \