This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 2153c6795cf93bc374357a4408f425213d872398 Author: James Almer <[email protected]> AuthorDate: Thu Jun 11 10:59:28 2026 -0300 Commit: James Almer <[email protected]> CommitDate: Tue Jun 16 09:18:23 2026 -0300 avcodec/decode: don't discard the existing skip_samples value if a new side data doesn't report any Signed-off-by: James Almer <[email protected]> --- libavcodec/decode.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index a18b99e115..8702e04086 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -329,7 +329,9 @@ static int discard_samples(AVCodecContext *avctx, AVFrame *frame, int64_t *disca side = av_frame_get_side_data(frame, AV_FRAME_DATA_SKIP_SAMPLES); if (side && side->size >= 10) { - avci->skip_samples = AV_RL32(side->data); + int skip_samples = AV_RL32(side->data); + if (skip_samples) + avci->skip_samples = skip_samples; avci->skip_samples = FFMAX(0, avci->skip_samples); discard_padding = AV_RL32(side->data + 4); av_log(avctx, AV_LOG_DEBUG, "skip %d / discard %d samples due to side data\n", _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
