src->{data,size} does not need to match src->buf->{data,size}.
Signed-off-by: James Almer <[email protected]>
---
libavutil/frame.c | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/libavutil/frame.c b/libavutil/frame.c
index 9c3569db0e..d37f1511e8 100644
--- a/libavutil/frame.c
+++ b/libavutil/frame.c
@@ -741,16 +741,14 @@ AVBufferRef *av_frame_get_plane_buffer(const AVFrame
*frame, int plane)
return NULL;
}
-static AVFrameSideData *add_side_data_from_buf(AVFrameSideData ***sd,
- int *nb_sd,
- enum AVFrameSideDataType type,
- AVBufferRef *buf)
+static AVFrameSideData *add_side_data_from_buf_ext(AVFrameSideData ***sd,
+ int *nb_sd,
+ enum AVFrameSideDataType
type,
+ AVBufferRef *buf, uint8_t
*data,
+ size_t size)
{
AVFrameSideData *ret, **tmp;
- if (!buf)
- return NULL;
-
// *nb_sd + 1 needs to fit into an int and a size_t.
if ((unsigned)*nb_sd >= FFMIN(INT_MAX, SIZE_MAX))
return NULL;
@@ -765,8 +763,8 @@ static AVFrameSideData
*add_side_data_from_buf(AVFrameSideData ***sd,
return NULL;
ret->buf = buf;
- ret->data = ret->buf->data;
- ret->size = buf->size;
+ ret->data = data;
+ ret->size = size;
ret->type = type;
(*sd)[(*nb_sd)++] = ret;
@@ -774,6 +772,17 @@ static AVFrameSideData
*add_side_data_from_buf(AVFrameSideData ***sd,
return ret;
}
+static AVFrameSideData *add_side_data_from_buf(AVFrameSideData ***sd,
+ int *nb_sd,
+ enum AVFrameSideDataType type,
+ AVBufferRef *buf)
+{
+ if (!buf)
+ return NULL;
+
+ return add_side_data_from_buf_ext(sd, nb_sd, type, buf, buf->data,
buf->size);
+}
+
AVFrameSideData *av_frame_new_side_data_from_buf(AVFrame *frame,
enum AVFrameSideDataType type,
AVBufferRef *buf)
@@ -901,7 +910,8 @@ int av_frame_side_data_clone(AVFrameSideData ***sd, int
*nb_sd,
if (!buf)
return AVERROR(ENOMEM);
- sd_dst = add_side_data_from_buf(sd, nb_sd, src->type, buf);
+ sd_dst = add_side_data_from_buf_ext(sd, nb_sd, src->type, buf,
+ src->data, src->size);
if (!sd_dst) {
av_buffer_unref(&buf);
return AVERROR(ENOMEM);
--
2.44.0
_______________________________________________
ffmpeg-devel mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".
