[FFmpeg-devel] [PATCH 09/10] avcodec/libdav1d: Use av_memdup() where appropriate

Andreas Rheinhardt andreas.rheinhardt at outlook.com
Mon Oct 11 18:36:48 EEST 2021


Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
---
 libavcodec/libdav1d.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c
index 507aaa1a96..bbc81a9dc9 100644
--- a/libavcodec/libdav1d.c
+++ b/libavcodec/libdav1d.c
@@ -319,13 +319,13 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
             av_packet_unref(pkt);
 
             if (c->reordered_opaque != AV_NOPTS_VALUE) {
-                uint8_t *reordered_opaque = av_malloc(sizeof(c->reordered_opaque));
+                uint8_t *reordered_opaque = av_memdup(&c->reordered_opaque,
+                                                      sizeof(c->reordered_opaque));
                 if (!reordered_opaque) {
                     dav1d_data_unref(data);
                     return AVERROR(ENOMEM);
                 }
 
-                memcpy(reordered_opaque, &c->reordered_opaque, sizeof(c->reordered_opaque));
                 res = dav1d_data_wrap_user_data(data, reordered_opaque,
                                                 libdav1d_user_data_free, reordered_opaque);
                 if (res < 0) {
-- 
2.30.2



More information about the ffmpeg-devel mailing list