Merge commit 'f249e988' into release/2.2

* commit 'f249e988':
  smc: fix the bounds check

Conflicts:
	libavcodec/smc.c

See: c727401aMerged-by: Michael Niedermayer <michaelni@gmx.at>

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; \