RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-26 05:08:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '58dc526ebf722d33bf09275c1241674e0e6b9ef1' into release/2.4

Browse Source 
* commit '58dc526ebf722d33bf09275c1241674e0e6b9ef1':
  smc: fix the bounds check

Conflicts:
	libavcodec/smc.c

See: c727401aa9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-12-20 12:20:28 +01:00
commit b86c2640f6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/smc.c
View File

@ -70,7 +70,7 @@ typedef struct SmcContext {
row_ptr += stride * 4; \ row_ptr += stride * 4; \
} \ } \
total_blocks--; \ 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"); \ av_log(s->avctx, AV_LOG_INFO, "warning: block counter just went negative (this should not happen)\n"); \
return; \ return; \