[FFmpeg-cvslog] Merge commit 'bba9d8bdfb208b0ec2ccf182530347151ee3528b'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun Mar 19 17:39:49 2017 +0100| [a0220d949f2c25a3530f70fc53342bdfef7f884f] | committer: Clément Bœsch

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 at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a0220d949f2c25a3530f70fc53342bdfef7f884f
---

 libavcodec/qpeg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/qpeg.c b/libavcodec/qpeg.c
index 9bfecc3..e1210c1 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 */


======================================================================