virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/midivid: Perform lzss_uncompress() before ff_reget_buffer()

Browse Source 
This would avoid regeting the frame on lzss errors

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2022-08-22 21:29:55 +02:00
parent bcb4690304
commit 628fb97efb
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/midivid.c
View File

@@ -198,12 +198,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe,
bytestream2_skip(gb, 8); bytestream2_skip(gb, 8);
uncompressed = bytestream2_get_le32(gb); uncompressed = bytestream2_get_le32(gb);
if ((ret = ff_reget_buffer(avctx, s->frame, 0)) < 0) if (!uncompressed) {
return ret;
if (uncompressed) {
ret = decode_mvdv(s, avctx, frame);
} else {
av_fast_padded_malloc(&s->uncompressed, &s->uncompressed_size, 16LL * (avpkt->size - 12)); av_fast_padded_malloc(&s->uncompressed, &s->uncompressed_size, 16LL * (avpkt->size - 12));
if (!s->uncompressed) if (!s->uncompressed)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@@ -212,9 +207,13 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe,
if (ret < 0) if (ret < 0)
return ret; return ret;
bytestream2_init(gb, s->uncompressed, ret); bytestream2_init(gb, s->uncompressed, ret);
ret = decode_mvdv(s, avctx, frame);
} }
if ((ret = ff_reget_buffer(avctx, s->frame, 0)) < 0)
return ret;
ret = decode_mvdv(s, avctx, frame);
if (ret < 0) if (ret < 0)
return ret; return ret;
key = ret; key = ret;