diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 13:30:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 13:30:55 +0100 |
| commit | c266d0e1bd56272939feb4eeee91b927a27c0953 (patch) | |
| tree | e00e3371f9ca1b14848154bde4b3f1c8ca8b4b07 /libavcodec/smc.c | |
| parent | 8af8833591d3efb26dcb0bb6f660cd0f3f107679 (diff) | |
| parent | d423dd72be451462c6fb1cbbe313bed0194001ab (diff) | |
| download | ffmpeg-c266d0e1bd56272939feb4eeee91b927a27c0953.tar.gz | |
Merge commit 'd423dd72be451462c6fb1cbbe313bed0194001ab'
* commit 'd423dd72be451462c6fb1cbbe313bed0194001ab':
smc: fix the bounds check
Conflicts:
libavcodec/smc.c
See: c727401aa9d62335e89d118a5b4e202edf39d905
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/smc.c')
| -rw-r--r-- | libavcodec/smc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/smc.c b/libavcodec/smc.c index 01271b308c..131300a595 100644 --- 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; \ |