| Message ID | 20191217001742.15262-1-epirat07@gmail.com |
|---|---|
| State | Accepted |
| Commit | c3bb6efef285adb8ca06278df15473f3c4d5aec5 |
| Headers | show |
On 17 Dec 2019, at 1:17, Marvin Scholz wrote: > 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 > --- > libavformat/hls.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavformat/hls.c b/libavformat/hls.c > index 21353bbad7..4b1bb964ae 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; > -- > 2.20.1 (Apple Git-117) ping for review, please :)
> 在 2019年12月21日，下午7:02，Marvin Scholz <epirat07@gmail.com> 写道： > > On 17 Dec 2019, at 1:17, Marvin Scholz wrote: > >> 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 >> --- >> libavformat/hls.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/libavformat/hls.c b/libavformat/hls.c >> index 21353bbad7..4b1bb964ae 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; >> -- >> 2.20.1 (Apple Git-117) > > ping for review, please :) LGTM > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". Steven Thanks
On 12/21/2019 8:11 PM, Liu Steven wrote: > > >> 在 2019年12月21日，下午7:02，Marvin Scholz <epirat07@gmail.com> 写道： >> >> On 17 Dec 2019, at 1:17, Marvin Scholz wrote: >> >>> 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 >>> --- >>> libavformat/hls.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/libavformat/hls.c b/libavformat/hls.c >>> index 21353bbad7..4b1bb964ae 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; >>> -- >>> 2.20.1 (Apple Git-117) >> >> ping for review, please :) > > LGTM Pushed.
On 12/21/2019 8:11 PM, Liu Steven wrote: > > >> 在 2019年12月21日，下午7:02，Marvin Scholz <epirat07@gmail.com> 写道： >> >> On 17 Dec 2019, at 1:17, Marvin Scholz wrote: >> >>> 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 >>> --- >>> libavformat/hls.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/libavformat/hls.c b/libavformat/hls.c >>> index 21353bbad7..4b1bb964ae 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; >>> -- >>> 2.20.1 (Apple Git-117) >> >> ping for review, please :) > > LGTM Pushed.
diff --git a/libavformat/hls.c b/libavformat/hls.c index 21353bbad7..4b1bb964ae 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;