This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 3ed7bc65808fbbab312e798607b92b7fe644ed34 Author: Kacper Michajłow <[email protected]> AuthorDate: Wed Oct 14 10:39:20 2026 +0200 Commit: Kacper Michajłow <[email protected]> CommitDate: Fri Oct 16 21:17:22 2026 +0000 avformat/hls: keep the rendition dispositions when a stream is updated Add the dispositions of the subdemuxer stream to the ones set from the EXT-X-MEDIA attributes instead of replacing them. Signed-off-by: Kacper Michajłow <[email protected]> --- libavformat/hls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 129df0ccff..766f9a6274 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -2359,8 +2359,8 @@ static int set_stream_info_from_input_stream(AVStream *st, struct playlist *pls, else avpriv_set_pts_info(st, ist->pts_wrap_bits, ist->time_base.num, ist->time_base.den); - // copy disposition - st->disposition = ist->disposition; + // add the dispositions of the subdemuxer stream to the rendition ones + st->disposition |= ist->disposition; av_dict_copy(&st->metadata, ist->metadata, 0); -- To stop receiving notification emails like this one, please contact [email protected]. _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
