highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'bba9d8bdfb208b0ec2ccf182530347151ee3528b'

Browse Source 
* commit 'bba9d8bdfb208b0ec2ccf182530347151ee3528b':
  qpeg: fix an off by 1 error in the MV check

See dd3bfe3cc1ca26d0fff3a3baf61a40207032143f

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-03-19 17:39:49 +01:00
commit a0220d949f
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/qpeg.c
View File

@ -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) || if ((me_x + filled < 0) || (me_x + me_w + filled > width) ||
(height - me_y - me_h < 0) || (height - me_y >= orig_height) || (height - me_y - me_h < 0) || (height - me_y >= orig_height) ||
(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 */