Merge commit 'd423dd72be451462c6fb1cbbe313bed0194001ab'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 12:30:25 +0000 (13:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 12:30:55 +0000 (13:30 +0100)
* commit 'd423dd72be451462c6fb1cbbe313bed0194001ab':
  smc: fix the bounds check

Conflicts:
libavcodec/smc.c

See: c727401aa9d62335e89d118a5b4e202edf39d905
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/smc.c

index 01271b308c418f70f11f7b5e5311078d49a29ffb..131300a59552ff94538ed9aa8fe48de48608cd9b 100644 (file)
@@ -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; \