RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-02 18:48:27 +00:00
Code Issues Projects Releases Wiki Activity

nuv: Do not ignore lzo decompression failures

Browse Source 
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
(cherry picked from commit aae159a7cc)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Conflicts:
	libavcodec/nuv.c
This commit is contained in:
Luca Barbato 2013-08-12 00:16:12 +02:00
parent 3cc05e0d9d
commit cda26ab21e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/nuv.c
View File

@ -177,8 +177,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
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;
}

1
tests/ref/fate/nuv
View File

@ -18,7 +18,6 @@
1, 20898, 4096, 0x28f7c6e5
0, 21021, 460800, 0x4b7f4df0
1, 22988, 4096, 0xca9d9df2
0, 24024, 460800, 0xb30eb322
1, 25078, 4096, 0x5c6b95a9
1, 27167, 4096, 0x0bdfc0bf
1, 29257, 4096, 0xd95a9277