[FFmpeg-cvslog] avcodec/fmvc: Move frame allocation to a later stage
Michael Niedermayer
git at videolan.org
Fri Nov 4 12:04:13 EET 2022
ffmpeg | branch: release/5.0 | Michael Niedermayer <michael at niedermayer.cc> | Fri Jun 10 23:09:09 2022 +0200| [728b3bc74ed4541680cd514e2487e7a5ea22020d] | committer: Michael Niedermayer
avcodec/fmvc: Move frame allocation to a later stage
This way more things are checked before allocation
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 9783749c66bf6ca2ce7a6db4c74957fe77cbe803)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=728b3bc74ed4541680cd514e2487e7a5ea22020d
---
libavcodec/fmvc.c | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/libavcodec/fmvc.c b/libavcodec/fmvc.c
index aab46da9cf..1e34f134a4 100644
--- a/libavcodec/fmvc.c
+++ b/libavcodec/fmvc.c
@@ -401,20 +401,17 @@ static int decode_frame(AVCodecContext *avctx, void *data,
PutByteContext *pb = &s->pb;
AVFrame *frame = data;
int ret, y, x;
+ int key_frame;
if (avpkt->size < 8)
return AVERROR_INVALIDDATA;
- if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
- return ret;
-
bytestream2_init(gb, avpkt->data, avpkt->size);
bytestream2_skip(gb, 2);
- frame->key_frame = !!bytestream2_get_le16(gb);
- frame->pict_type = frame->key_frame ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
+ key_frame = !!bytestream2_get_le16(gb);
- if (frame->key_frame) {
+ if (key_frame) {
const uint8_t *src;
unsigned type, size;
uint8_t *dst;
@@ -434,6 +431,12 @@ static int decode_frame(AVCodecContext *avctx, void *data,
return AVERROR_PATCHWELCOME;
}
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
+ return ret;
+
+ frame->key_frame = 1;
+ frame->pict_type = AV_PICTURE_TYPE_I;
+
src = s->buffer;
dst = frame->data[0] + (avctx->height - 1) * frame->linesize[0];
for (y = 0; y < avctx->height; y++) {
@@ -514,6 +517,12 @@ static int decode_frame(AVCodecContext *avctx, void *data,
dst = &rect[block_h * s->stride];
}
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
+ return ret;
+
+ frame->key_frame = 0;
+ frame->pict_type = AV_PICTURE_TYPE_P;
+
ssrc = s->buffer;
ddst = frame->data[0] + (avctx->height - 1) * frame->linesize[0];
for (y = 0; y < avctx->height; y++) {
More information about the ffmpeg-cvslog
mailing list