Merge commit 'aae159a7cc4df7d0521901022b778c9da251c24e'

* commit 'aae159a7cc4df7d0521901022b778c9da251c24e':
  nuv: Do not ignore lzo decompression failures

Conflicts:
	libavcodec/nuv.c
	tests/ref/fate/nuv-rtjpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/nuv.c

@@ -208,8 +208,10 @@ retry:
     buf_size -= 12;
     if (comptype == NUV_RTJPEG_IN_LZO || comptype == NUV_LZO) {
         int outlen = c->decomp_size - AV_LZO_OUTPUT_PADDING, inlen = buf_size;
-        if (av_lzo1x_decode(c->decomp_buf, &outlen, buf, &inlen))
+        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;
     }

tests/ref/fate/nuv-rtjpeg

@@ -7,4 +7,3 @@
 0,          9,          9,        1,   460800, 0x4e091ee2
 0,         10,         10,        1,   460800, 0x2ea88828
 0,         11,         11,        1,   460800, 0x4b7f4df0
-0,         12,         12,        1,   460800, 0xa57f20d0