Browse Source

nuv: Do not ignore lzo decompression failures

Update the fate reference since the last broken frame is not decoded
anymore.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
tags/n2.1
Luca Barbato 11 years ago
parent
commit
aae159a7cc
2 changed files with 3 additions and 2 deletions
  1. +3
    -1
      libavcodec/nuv.c
  2. +0
    -1
      tests/ref/fate/nuv-rtjpeg

+ 3
- 1
libavcodec/nuv.c View File

@@ -200,8 +200,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
buf_size -= 12;
if (comptype == NUV_RTJPEG_IN_LZO || comptype == NUV_LZO) {
int outlen = c->decomp_size, 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;
}


+ 0
- 1
tests/ref/fate/nuv-rtjpeg View File

@@ -7,4 +7,3 @@
0, 269, 269, 0, 460800, 0x4e091ee2
0, 302, 302, 0, 460800, 0x2ea88828
0, 335, 335, 0, 460800, 0x4b7f4df0
0, 369, 369, 0, 460800, 0xb30eb322

Loading…
Cancel
Save