mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge commit 'bba9d8bdfb208b0ec2ccf182530347151ee3528b'
* commit 'bba9d8bdfb208b0ec2ccf182530347151ee3528b':
qpeg: fix an off by 1 error in the MV check
See dd3bfe3cc1
Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
commit
a0220d949f
@ -166,7 +166,7 @@ static void av_noinline qpeg_decode_inter(QpegContext *qctx, uint8_t *dst,
|
||||
if ((me_x + filled < 0) || (me_x + me_w + filled > width) ||
|
||||
(height - me_y - me_h < 0) || (height - me_y >= orig_height) ||
|
||||
(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);
|
||||
else {
|
||||
/* do motion compensation */
|
||||
|
Loading…
Reference in New Issue
Block a user