This way we can check the input before allocation in the next commit
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
libavcodec/mv30.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/libavcodec/mv30.c b/libavcodec/mv30.c
index c2d0547053..0b19534b00 100644
--- a/libavcodec/mv30.c
+++ b/libavcodec/mv30.c
@@ -414,6 +414,9 @@ static int decode_intra(AVCodecContext *avctx,
GetBitContext *gb, AVFrame *frame
skip_bits_long(gb, s->mode_size * 8);
+ if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0)
+ return ret;
+
linesize[0] = frame->linesize[0];
linesize[1] = frame->linesize[0];
linesize[2] = frame->linesize[0];
@@ -473,6 +476,9 @@ static int decode_inter(AVCodecContext *avctx,
GetBitContext *gb,
int ret, cnt = 0;
int flags = 0;
+ if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0)
+ return ret;
+
in_linesize[0] = prev->linesize[0];
in_linesize[1] = prev->linesize[0];
in_linesize[2] = prev->linesize[0];
@@ -610,9 +616,6 @@ static int decode_frame(AVCodecContext *avctx, AVFrame
*frame,
if ((ret = init_get_bits8(gb, avpkt->data, avpkt->size)) < 0)
return ret;
- if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0)
- return ret;
-
s->intra_quant = get_bits(gb, 8);
s->inter_quant = s->intra_quant + get_sbits(gb, 8);
s->is_inter = get_bits_le(gb, 16);
--
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".
