qpeg.c (libav-11.7) | : | qpeg.c (libav-11.8) | ||
---|---|---|---|---|
skipping to change at line 164 | skipping to change at line 164 | |||
val -= 16; | val -= 16; | |||
me_x = val; | me_x = val; | |||
val = corr & 0xF; | val = corr & 0xF; | |||
if(val > 7) | if(val > 7) | |||
val -= 16; | val -= 16; | |||
me_y = val; | me_y = val; | |||
/* check motion vector */ | /* check motion vector */ | |||
if ((me_x + filled < 0) || (me_x + me_w + filled > width) || | if ((me_x + filled < 0) || (me_x + me_w + filled > width) || | |||
(height - me_y - me_h < 0) || (height - me_y > orig_heigh t) || | (height - me_y - me_h < 0) || (height - me_y >= orig_heig ht) || | |||
(filled + me_w > width) || (height - me_h < 0)) | (filled + me_w > width) || (height - me_h < 0)) | |||
av_log(NULL, AV_LOG_ERROR, "Bogus motion vector (%i,%i), block size %ix%i at %i,%i\n", | av_log(qctx->avctx, AV_LOG_ERROR, "Bogus motion vector ( %i,%i), block size %ix%i at %i,%i\n", | |||
me_x, me_y, me_w, me_h, filled, height); | me_x, me_y, me_w, me_h, filled, height); | |||
else { | else { | |||
/* do motion compensation */ | /* do motion compensation */ | |||
me_plane = refdata + (filled + me_x) + (height - me_y) * width; | me_plane = refdata + (filled + me_x) + (height - me_y) * width; | |||
for(j = 0; j < me_h; j++) { | for(j = 0; j < me_h; j++) { | |||
for(i = 0; i < me_w; i++) | for(i = 0; i < me_w; i++) | |||
dst[filled + i - (j * stride)] = me_plane[i - (j * width)]; | dst[filled + i - (j * stride)] = me_plane[i - (j * width)]; | |||
} | } | |||
} | } | |||
} | } | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |