Merge commit '075dbc185521f193c98b896cd63be3ec2613df5d'

* commit '075dbc185521f193c98b896cd63be3ec2613df5d':
  nuv: Pad the lzo outbuf

Conflicts:
	libavcodec/nuv.c

See: 95e1dfee76c9ecdf70037b7e792897bc6e3d460b
See: 266f6eefc603dd3c34be7de94eec5c9c293b80f1
Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/nuv.c
index 3888c0c,0905411..edb38c3
--- 1/libavcodec/nuv.c
--- 2/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@@@ -121,10 -120,6 +121,10 @@@ static int codec_reinit(AVCodecContext 
      if (quality >= 0)
          get_quant_quality(c, quality);
      if (width != c->width || height != c->height) {
-         int buf_size = 24 + height * width * 3 / 2 + AV_LZO_OUTPUT_PADDING;
 +        // also reserve space for a possible additional header
++        int buf_size = 24 + height * width * 3 / 2 + FFMAX(AV_LZO_OUTPUT_PADDING, FF_INPUT_BUFFER_PADDING_SIZE);
 +        if (buf_size > INT_MAX/8)
 +            return -1;
          if ((ret = av_image_check_size(height, width, 0, avctx)) < 0)
              return ret;
          avctx->width  = c->width  = width;
@@@ -207,13 -200,14 +207,14 @@@ retry
      buf       = &buf[12];
      buf_size -= 12;
      if (comptype == NUV_RTJPEG_IN_LZO || comptype == NUV_LZO) {
-         int outlen = c->decomp_size - AV_LZO_OUTPUT_PADDING, inlen = buf_size;
 -        int outlen = c->decomp_size - FF_INPUT_BUFFER_PADDING_SIZE;
++        int outlen = c->decomp_size - FFMAX(FF_INPUT_BUFFER_PADDING_SIZE, AV_LZO_OUTPUT_PADDING);
+         int inlen  = buf_size;
          if (av_lzo1x_decode(c->decomp_buf, &outlen, buf, &inlen)) {
              av_log(avctx, AV_LOG_ERROR, "error during lzo decompression\n");
              return AVERROR_INVALIDDATA;
          }
          buf      = c->decomp_buf;
-         buf_size = c->decomp_size - AV_LZO_OUTPUT_PADDING - outlen;
 -        buf_size = outlen;
++        buf_size = c->decomp_size - FFMAX(FF_INPUT_BUFFER_PADDING_SIZE, AV_LZO_OUTPUT_PADDING) - outlen;
      }
      if (c->codec_frameheader) {
          int w, h, q;