diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-19 17:39:49 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-19 17:39:49 +0100 |
| commit | a0220d949f2c25a3530f70fc53342bdfef7f884f (patch) | |
| tree | 5893b68432c59e142680777af46a314f1cc9db6d /libavcodec | |
| parent | f09aa73b305073e193af88cf12b52b8f4b609529 (diff) | |
| parent | bba9d8bdfb208b0ec2ccf182530347151ee3528b (diff) | |
| download | ffmpeg-a0220d949f2c25a3530f70fc53342bdfef7f884f.tar.gz | |
Merge commit 'bba9d8bdfb208b0ec2ccf182530347151ee3528b'
* commit 'bba9d8bdfb208b0ec2ccf182530347151ee3528b':
qpeg: fix an off by 1 error in the MV check
See dd3bfe3cc1ca26d0fff3a3baf61a40207032143f
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/qpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/qpeg.c b/libavcodec/qpeg.c index 9bfecc3a31..e1210c1972 100644 --- a/libavcodec/qpeg.c +++ b/libavcodec/qpeg.c @@ -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 */ |