[FFmpeg-cvslog] avformat/hls: propagate icy to child AVIOContexts

Marvin Scholz git at videolan.org
Fri Dec 27 19:58:06 EET 2019


ffmpeg | branch: master | Marvin Scholz <epirat07 at gmail.com> | Tue Dec 17 01:17:42 2019 +0100| [c3bb6efef285adb8ca06278df15473f3c4d5aec5] | committer: James Almer

avformat/hls: propagate icy to child AVIOContexts

When the user decides they do not want to to send the Icy-MetaData
header, this should be respected for all requests, not just the first
one.

Fix #5578

Reviewed-by: Liu Steven <lq at chinaffmpeg.org>
Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c3bb6efef285adb8ca06278df15473f3c4d5aec5
---

 libavformat/hls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/hls.c b/libavformat/hls.c
index f60396f246..538af0dbf8 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -1663,7 +1663,7 @@ static int save_avio_options(AVFormatContext *s)
 {
     HLSContext *c = s->priv_data;
     static const char * const opts[] = {
-        "headers", "http_proxy", "user_agent", "cookies", "referer", "rw_timeout", NULL };
+        "headers", "http_proxy", "user_agent", "cookies", "referer", "rw_timeout", "icy", NULL };
     const char * const * opt = opts;
     uint8_t *buf;
     int ret = 0;



More information about the ffmpeg-cvslog mailing list