virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases 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
This commit is contained in:
Luca Barbato 2013-08-12 00:16:12 +02:00
parent 46dee21a32
commit aae159a7cc
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

@ -200,8 +200,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
buf_size -= 12; buf_size -= 12;
if (comptype == NUV_RTJPEG_IN_LZO || comptype == NUV_LZO) { if (comptype == NUV_RTJPEG_IN_LZO || comptype == NUV_LZO) {
int outlen = c->decomp_size, inlen = buf_size; 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"); av_log(avctx, AV_LOG_ERROR, "error during lzo decompression\n");
return AVERROR_INVALIDDATA;
}
buf = c->decomp_buf; buf = c->decomp_buf;
buf_size = c->decomp_size; buf_size = c->decomp_size;
} }

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

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