This is an automated email from the git hooks/post-receive script.

Git pushed a commit to branch master
in repository ffmpeg.

commit 6053155d19335e5a501d186fde4bd24eaf93724e
Author:     Kacper Michajłow <[email protected]>
AuthorDate: Tue Sep 29 11:34:15 2026 +0200
Commit:     Kacper Michajłow <[email protected]>
CommitDate: Tue Sep 29 18:21:05 2026 +0000

    avformat/hls: use the playlist of the new variant in ensure_playlist()
    
    new_playlist() returns the known playlist for a duplicate URL, which is not
    necessarily the last one in c->playlists. Take it from the variant, so media
    tags of a Master Playlist do not end up in an unrelated playlist.
    
    Fixes: 54f0296dfe
    Signed-off-by: Kacper Michajłow <[email protected]>
---
 libavformat/hls.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavformat/hls.c b/libavformat/hls.c
index 730e8b98fe..97755da3a3 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -657,9 +657,10 @@ static int ensure_playlist(HLSContext *c, struct playlist 
**pls, const char *url
 {
     if (*pls)
         return 0;
-    if (!new_variant(c, NULL, url, NULL))
+    struct variant *var = new_variant(c, NULL, url, NULL);
+    if (!var)
         return AVERROR(ENOMEM);
-    *pls = c->playlists[c->n_playlists - 1];
+    *pls = var->playlists[0];
     return 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]

Reply via email to