[FFmpeg-devel] [PATCH] avformat/hlsenc: Added context to av_log calls

刘歧 lq at chinaffmpeg.org
Fri Nov 24 12:15:04 EET 2017


> 在 2017年11月24日,18:12,Karthick J <kjeyapal at akamai.com> 写道:
> 
> ---
> libavformat/hlsenc.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
> index 30ccf73..379a4ec 100644
> --- a/libavformat/hlsenc.c
> +++ b/libavformat/hlsenc.c
> @@ -1057,7 +1057,6 @@ static int get_relative_url(const char *master_url, const char *media_url,
>     if (p) {
>         base_len = FFABS(p - master_url);
>         if (av_strncasecmp(master_url, media_url, base_len)) {
> -            av_log(NULL, AV_LOG_WARNING, "Unable to find relative url\n");
>             return AVERROR(EINVAL);
>         }
>     }
> @@ -1096,7 +1095,7 @@ static int create_master_playlist(AVFormatContext *s,
>                      &options);
>     av_dict_free(&options);
>     if (ret < 0) {
> -        av_log(NULL, AV_LOG_ERROR, "Failed to open master play list file '%s'\n",
> +        av_log(s, AV_LOG_ERROR, "Failed to open master play list file '%s'\n",
>                 hls->master_m3u8_url);
>         goto fail;
>     }
> @@ -1118,7 +1117,7 @@ static int create_master_playlist(AVFormatContext *s,
>         ret = get_relative_url(hls->master_m3u8_url, vs->m3u8_name,
>                                m3u8_rel_name, m3u8_name_size);
>         if (ret < 0) {
> -            av_log(NULL, AV_LOG_ERROR, "Unable to find relative URL\n");
> +            av_log(s, AV_LOG_ERROR, "Unable to find relative URL\n");
>             goto fail;
>         }
> 
> @@ -1132,7 +1131,7 @@ static int create_master_playlist(AVFormatContext *s,
>         }
> 
>         if (!vid_st && !aud_st) {
> -            av_log(NULL, AV_LOG_WARNING, "Media stream not found\n");
> +            av_log(s, AV_LOG_WARNING, "Media stream not found\n");
>             continue;
>         }
> 
> @@ -1144,7 +1143,7 @@ static int create_master_playlist(AVFormatContext *s,
>         bandwidth += bandwidth / 10;
> 
>         if (!bandwidth) {
> -            av_log(NULL, AV_LOG_WARNING,
> +            av_log(s, AV_LOG_WARNING,
>                     "Bandwidth info not available, set audio and video bitrates\n");
>             av_freep(&m3u8_rel_name);
>             continue;
> -- 
> 1.9.1
> 
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


LGTM


Thanks



More information about the ffmpeg-devel mailing list