virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

fftools/ffmpeg_dec: don't try to copy side data from the decoder if it already exists in the output frame

Browse Source 
We can't use AV_FRAME_SIDE_DATA_FLAG_REPLACE here because the side data already in the
frame should have priority over the global one, so just ensure we don't copy any if
it already exists.

Fixes ticket #11468.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2025-02-23 23:57:44 -03:00
parent d161604625
commit 8e6032990c
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fftools/ffmpeg_dec.c
View File

@ -788,10 +788,14 @@ static int packet_decode(DecoderPriv *dp, AVPacket *pkt, AVFrame *frame)
frame->time_base = dec->pkt_timebase; frame->time_base = dec->pkt_timebase;
ret = clone_side_data(&frame->side_data, &frame->nb_side_data, for (int i = 0; i < dec->nb_decoded_side_data; i++) {
dec->decoded_side_data, dec->nb_decoded_side_data, 0); const AVFrameSideData *src = dec->decoded_side_data[i];
if (ret < 0) if (av_frame_side_data_get(frame->side_data, frame->nb_side_data, src->type))
return ret; continue;
ret = av_frame_side_data_clone(&frame->side_data, &frame->nb_side_data, src, 0);
if (ret < 0)
return ret;
}
if (dec->codec_type == AVMEDIA_TYPE_AUDIO) { if (dec->codec_type == AVMEDIA_TYPE_AUDIO) {
dp->dec.samples_decoded += frame->nb_samples; dp->dec.samples_decoded += frame->nb_samples;