highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fftools/ffmpeg: stop using AVStream.side_data

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2023-07-16 18:56:17 -03:00
parent e500eb5a95
commit 3fd37b5268
4 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
fftools/ffmpeg_mux_init.c
View File

@@ -1045,24 +1045,28 @@ static int streamcopy_init(const Muxer *mux, OutputStream *ost)
}
}
for (int i = 0; i < ist->st->nb_side_data; i++) {
const AVPacketSideData *sd_src = &ist->st->side_data[i];
uint8_t *dst_data;
for (int i = 0; i < ist->st->codecpar->nb_coded_side_data; i++) {
const AVPacketSideData *sd_src = &ist->st->codecpar->coded_side_data[i];
AVPacketSideData *sd_dst;
dst_data = av_stream_new_side_data(ost->st, sd_src->type, sd_src->size);
if (!dst_data) {
sd_dst = av_packet_side_data_new(&ost->st->codecpar->coded_side_data,
&ost->st->codecpar->nb_coded_side_data,
sd_src->type, sd_src->size, 0);
if (!sd_dst) {
ret = AVERROR(ENOMEM);
goto fail;
}
memcpy(dst_data, sd_src->data, sd_src->size);
memcpy(sd_dst->data, sd_src->data, sd_src->size);
}
#if FFMPEG_ROTATION_METADATA
if (ost->rotate_overridden) {
uint8_t *sd = av_stream_new_side_data(ost->st, AV_PKT_DATA_DISPLAYMATRIX,
sizeof(int32_t) * 9);
AVPacketSideData *sd = av_packet_side_data_new(&ost->st->codecpar->coded_side_data,
&ost->st->codecpar->nb_coded_side_data,
AV_PKT_DATA_DISPLAYMATRIX,
sizeof(int32_t) * 9, 0);
if (sd)
av_display_rotation_set((int32_t *)sd, -ost->rotate_override_value);
av_display_rotation_set((int32_t *)sd->data, -ost->rotate_override_value);
}
#endif