From e69d8fc619d2e640e207c2b412cfc0b6cc6d5230 Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Thu, 15 Oct 2015 13:42:38 +0300 Subject: [PATCH] avformat/hls: fix segment selection regression on track changes of live streams Commit ad701326b43078b90 ("avformat/hls: open playlists immediately when AVDISCARD_ALL is dropped") inadvertently caused first_packet to never be cleared, causing select_cur_seq_no() to not use the specific code for live streams. In practice this means that when the user selects a different audio track during live stream (i.e. non-VOD) playback, there may be some additional delay as the code might select an incorrect segment at first, and we have to wait for video to catch audio (if too late segment was selected) or to download more following audio segments (if too early segment was selected). Fix that by restoring the zeroing of first_packet. (cherry picked from commit fd74d45d5158812675105a3b4aeb29c67b82f7e8) --- libavformat/hls.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/hls.c b/libavformat/hls.c index 3f1d97eb6f..59117f9072 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1535,6 +1535,7 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt) int ret, i, minplaylist = -1; recheck_discard_flags(s, c->first_packet); + c->first_packet = 0; for (i = 0; i < c->n_playlists; i++) { struct playlist *pls = c->playlists[i];