This would avoid regeting the frame on lzss errors
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
libavcodec/midivid.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/libavcodec/midivid.c b/libavcodec/midivid.c
index 7448c8c797..6b76d5bcad 100644
--- a/libavcodec/midivid.c
+++ b/libavcodec/midivid.c
@@ -203,12 +203,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);
@@ -217,9 +212,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;
--
2.17.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
