Signed-off-by: James Almer <jamr...@gmail.com>
---
libavcodec/evc_frame_merge_bsf.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/libavcodec/evc_frame_merge_bsf.c b/libavcodec/evc_frame_merge_bsf.c
index d2746a1ef6..fbb344490a 100644
--- a/libavcodec/evc_frame_merge_bsf.c
+++ b/libavcodec/evc_frame_merge_bsf.c
@@ -61,6 +61,7 @@ static void evc_frame_merge_flush(AVBSFContext *bsf)
EVCFMergeContext *ctx = bsf->priv_data;
av_packet_unref(ctx->in);
+ ctx->au_buffer.data_size = 0;
}
static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out)
@@ -117,9 +118,13 @@ static int evc_frame_merge_filter(AVBSFContext *bsf,
AVPacket *out)
if (au_end_found) {
uint8_t *data = av_memdup(ctx->au_buffer.data,
ctx->au_buffer.data_size);
- err = av_packet_from_data(out, data, ctx->au_buffer.data_size);
+ size_t data_size = ctx->au_buffer.data_size;
ctx->au_buffer.data_size = 0;
+ if (!data)
+ return AVERROR(ENOMEM);
+
+ err = av_packet_from_data(out, data, data_size);
} else
err = AVERROR(EAGAIN);
--
2.41.0
_______________________________________________
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".
