har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/mjpegdec: respect side data preference

Browse Source
This commit is contained in:
Niklas Haas 2024-02-17 21:51:19 +01:00 committed by Anton Khirnov
parent 62f40d0e38
commit ed3cc8fc65
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/mjpegdec.c
View File

@ -2840,18 +2840,20 @@ the_end:
for (i = 0; i < s->iccnum; i++) for (i = 0; i < s->iccnum; i++)
total_size += s->iccentries[i].length; total_size += s->iccentries[i].length;
sd = av_frame_new_side_data(frame, AV_FRAME_DATA_ICC_PROFILE, total_size); ret = ff_frame_new_side_data(avctx, frame, AV_FRAME_DATA_ICC_PROFILE, total_size, &sd);
if (!sd) { if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Could not allocate frame side data\n"); av_log(avctx, AV_LOG_ERROR, "Could not allocate frame side data\n");
return AVERROR(ENOMEM); return ret;
} }
if (sd) {
/* Reassemble the parts, which are now in-order. */ /* Reassemble the parts, which are now in-order. */
for (i = 0; i < s->iccnum; i++) { for (i = 0; i < s->iccnum; i++) {
memcpy(sd->data + offset, s->iccentries[i].data, s->iccentries[i].length); memcpy(sd->data + offset, s->iccentries[i].data, s->iccentries[i].length);
offset += s->iccentries[i].length; offset += s->iccentries[i].length;
} }
} }
}
if (e = av_dict_get(s->exif_metadata, "Orientation", e, AV_DICT_IGNORE_SUFFIX)) { if (e = av_dict_get(s->exif_metadata, "Orientation", e, AV_DICT_IGNORE_SUFFIX)) {
char *value = e->value + strspn(e->value, " \n\t\r"), *endptr; char *value = e->value + strspn(e->value, " \n\t\r"), *endptr;