diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 19:33:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-25 21:09:42 +0200 |
| commit | f2d56c2eebe6412c21f7376aaabdeedb91f61875 (patch) | |
| tree | 444118b833edb8a5387222cde4caef1a503cf1ea | |
| parent | 46c1e5de58ac8cbe0f222e2649cf6bd6dd768012 (diff) | |
| download | ffmpeg-f2d56c2eebe6412c21f7376aaabdeedb91f61875.tar.gz | |
motion_est: more complete SAB diamond size check
This makes no difference with the current #defines
Fixes CID732255
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3a48e38ad0e37d89065843548414d367e70593bf)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/motion_est.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index ad6395296e..0b8c4f4058 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -300,7 +300,7 @@ int ff_init_me(MpegEncContext *s){ int cache_size= FFMIN(ME_MAP_SIZE>>ME_MAP_SHIFT, 1<<ME_MAP_SHIFT); int dia_size= FFMAX(FFABS(s->avctx->dia_size)&255, FFABS(s->avctx->pre_dia_size)&255); - if(FFMIN(s->avctx->dia_size, s->avctx->pre_dia_size) < -ME_MAP_SIZE){ + if(FFMIN(s->avctx->dia_size, s->avctx->pre_dia_size) < -FFMIN(ME_MAP_SIZE, MAX_SAB_SIZE)){ av_log(s->avctx, AV_LOG_ERROR, "ME_MAP size is too small for SAB diamond\n"); return -1; } |