| Message ID | 20180428183706.2482-1-nfxjfg@googlemail.com |
|---|---|
| State | Accepted |
| Commit | 1d642ebfdb31b7c55ba02500a76f3febf04ce434 |
| Headers | show |
On Sat, Apr 28, 2018 at 08:37:06PM +0200, wm4 wrote: > This code will print a warning if any user agent is set - even if the > API user used the proper non-deprecated "user_agent" option. > > This change should not even break anything, because even if the user > sets the deprecated "user-agent" option, http.c copies it to the > "user_agent" option anyway. > --- > libavformat/hls.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavformat/hls.c b/libavformat/hls.c > index ffec124818..4ee4be769d 100644 > --- a/libavformat/hls.c > +++ b/libavformat/hls.c > @@ -1593,7 +1593,7 @@ static int save_avio_options(AVFormatContext *s) > { > HLSContext *c = s->priv_data; > static const char * const opts[] = { > - "headers", "http_proxy", "user_agent", "user-agent", "cookies", "referer", "rw_timeout", NULL }; > + "headers", "http_proxy", "user_agent", "cookies", "referer", "rw_timeout", NULL }; > const char * const * opt = opts; > uint8_t *buf; > int ret = 0; Should be fine, thanks.
On Sun, 29 Apr 2018 14:23:17 +0200 Clément Bœsch <u@pkh.me> wrote: > On Sat, Apr 28, 2018 at 08:37:06PM +0200, wm4 wrote: > > This code will print a warning if any user agent is set - even if the > > API user used the proper non-deprecated "user_agent" option. > > > > This change should not even break anything, because even if the user > > sets the deprecated "user-agent" option, http.c copies it to the > > "user_agent" option anyway. > > --- > > libavformat/hls.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/libavformat/hls.c b/libavformat/hls.c > > index ffec124818..4ee4be769d 100644 > > --- a/libavformat/hls.c > > +++ b/libavformat/hls.c > > @@ -1593,7 +1593,7 @@ static int save_avio_options(AVFormatContext *s) > > { > > HLSContext *c = s->priv_data; > > static const char * const opts[] = { > > - "headers", "http_proxy", "user_agent", "user-agent", "cookies", "referer", "rw_timeout", NULL }; > > + "headers", "http_proxy", "user_agent", "cookies", "referer", "rw_timeout", NULL }; > > const char * const * opt = opts; > > uint8_t *buf; > > int ret = 0; > > Should be fine, thanks. > Pushed.
diff --git a/libavformat/hls.c b/libavformat/hls.c index ffec124818..4ee4be769d 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1593,7 +1593,7 @@ static int save_avio_options(AVFormatContext *s) { HLSContext *c = s->priv_data; static const char * const opts[] = { - "headers", "http_proxy", "user_agent", "user-agent", "cookies", "referer", "rw_timeout", NULL }; + "headers", "http_proxy", "user_agent", "cookies", "referer", "rw_timeout", NULL }; const char * const * opt = opts; uint8_t *buf; int ret = 0;