summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Haas <git@haasn.dev>2024-02-17 21:53:07 +0100
committerAnton Khirnov <anton@khirnov.net>2024-03-04 14:03:17 +0100
commit22a946f0a449a367cf091b57a9cec505bbd4f1a3 (patch)
tree624abde2f881351082f315967075f99afccda382
parent2640773601ead516f81711304ba926a17fa32aac (diff)
avcodec/tiff: respect side data preference
-rw-r--r--libavcodec/tiff.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 71cb703821..cb4d378753 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -1706,11 +1706,11 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
if (bytestream2_get_bytes_left(&gb_temp) < count)
return AVERROR_INVALIDDATA;
- sd = av_frame_new_side_data(frame, AV_FRAME_DATA_ICC_PROFILE, count);
- if (!sd)
- return AVERROR(ENOMEM);
-
- bytestream2_get_bufferu(&gb_temp, sd->data, count);
+ ret = ff_frame_new_side_data(s->avctx, frame, AV_FRAME_DATA_ICC_PROFILE, count, &sd);
+ if (ret < 0)
+ return ret;
+ if (sd)
+ bytestream2_get_bufferu(&gb_temp, sd->data, count);
break;
case TIFF_ARTIST:
ADD_METADATA(count, "artist", NULL);