X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=libavcodec%2Fsnow.c;h=2f3ddbee18aef26953c9bad229c5badfde4a1e64;hb=4727611d489387aed926469ac757b2f1dfea3e33;hp=a4fe8b603ade694789a2d20bc3d2b2747bdd40bd;hpb=719fde47ca641edd4321f384579438f930bc50eb;p=ffmpeg diff --git a/libavcodec/snow.c b/libavcodec/snow.c index a4fe8b603ad..2f3ddbee18a 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -343,8 +343,8 @@ void ff_snow_pred_block(SnowContext *s, uint8_t *dst, uint8_t *tmp, int stride, sx += (mx>>4) - (HTAPS_MAX/2-1); sy += (my>>4) - (HTAPS_MAX/2-1); src += sx + sy*stride; - if( (unsigned)sx >= w - b_w - (HTAPS_MAX-2) - || (unsigned)sy >= h - b_h - (HTAPS_MAX-2)){ + if( (unsigned)sx >= FFMAX(w - b_w - (HTAPS_MAX-2), 0) + || (unsigned)sy >= FFMAX(h - b_h - (HTAPS_MAX-2), 0)){ s->dsp.emulated_edge_mc(tmp + MB_SIZE, src, stride, b_w+HTAPS_MAX-1, b_h+HTAPS_MAX-1, sx, sy, w, h); src= tmp + MB_SIZE; }