diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2022-08-22 21:29:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2022-08-28 22:06:44 +0200 |
| commit | 628fb97efb0b6202e56fab89670406261bf86d85 (patch) | |
| tree | 0c28ddbcd2de25d548fbc1e21d0c10d62cbf105e /libavcodec | |
| parent | bcb46903040e5a5199281f4ad0a1fdaf750ebc37 (diff) | |
| download | ffmpeg-628fb97efb0b6202e56fab89670406261bf86d85.tar.gz | |
avcodec/midivid: Perform lzss_uncompress() before ff_reget_buffer()
This would avoid regeting the frame on lzss errors
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/midivid.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libavcodec/midivid.c b/libavcodec/midivid.c index 49f31b0fa7..eaf138e87e 100644 --- a/libavcodec/midivid.c +++ b/libavcodec/midivid.c @@ -198,12 +198,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe, bytestream2_skip(gb, 8); uncompressed = bytestream2_get_le32(gb); - if ((ret = ff_reget_buffer(avctx, s->frame, 0)) < 0) - return ret; - - if (uncompressed) { - ret = decode_mvdv(s, avctx, frame); - } else { + if (!uncompressed) { av_fast_padded_malloc(&s->uncompressed, &s->uncompressed_size, 16LL * (avpkt->size - 12)); if (!s->uncompressed) return AVERROR(ENOMEM); @@ -212,9 +207,13 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe, if (ret < 0) return 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) return ret; key = ret; |