ffmpeg | branch: master | Steven Liu <l...@chinaffmpeg.org> | Fri Sep 6 12:10:15 2019 +0800| [07b4bf5f11e444cece5fcd5b637e3da3ecebb476] | committer: Steven Liu
avformat/hlsenc: move the warning message from every segment upload to init part Signed-off-by: Steven Liu <l...@chinaffmpeg.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=07b4bf5f11e444cece5fcd5b637e3da3ecebb476 --- libavformat/hlsenc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 52ee8941a1..216bb822d2 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -290,7 +290,6 @@ static void set_http_options(AVFormatContext *s, AVDictionary **options, HLSCont if (c->method) { av_dict_set(options, "method", c->method, 0); } else if (http_base_proto) { - av_log(c, AV_LOG_WARNING, "No HTTP method set, hls muxer defaulting to method PUT.\n"); av_dict_set(options, "method", "PUT", 0); } if (c->user_agent) @@ -2673,6 +2672,7 @@ static int hls_init(AVFormatContext *s) const char *vtt_pattern = "%d.vtt"; char *p = NULL; int vtt_basename_size = 0; + int http_base_proto = ff_is_http_proto(s->url); int fmp4_init_filename_len = strlen(hls->fmp4_init_filename) + 1; hls->has_default_key = 0; @@ -2690,6 +2690,10 @@ static int hls_init(AVFormatContext *s) goto fail; } + if (!hls->method && http_base_proto) { + av_log(c, AV_LOG_WARNING, "No HTTP method set, hls muxer defaulting to method PUT.\n"); + } + ret = validate_name(hls->nb_varstreams, s->url); if (ret < 0) goto fail; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
