diff mbox

[FFmpeg-devel,2/2] avformat/hlsenc: Refactor an inconsistent variable name

Message ID 1511338135-12551-2-git-send-email-kjeyapal@akamai.com
State Accepted
Commit 241c1192d6b8db17f4ea6055573417a4830d5cc6
Headers show

Commit Message

Jeyapal, Karthick Nov. 22, 2017, 8:08 a.m. UTC 
---
 libavformat/hlsenc.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Comments

Liu Steven Nov. 22, 2017, 8:12 a.m. UTC | #1 
> 在 2017年11月22日，16:08，Karthick J <kjeyapal@akamai.com> 写道：
> 
> ---
> libavformat/hlsenc.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
> index 525605b..611cc99 100644
> --- a/libavformat/hlsenc.c
> +++ b/libavformat/hlsenc.c
> @@ -1074,7 +1074,7 @@ static int create_master_playlist(AVFormatContext *s,
>     AVDictionary *options = NULL;
>     unsigned int i, j;
>     int m3u8_name_size, ret, bandwidth;
> -    char *m3U8_rel_name;
> +    char *m3u8_rel_name;
> 
>     input_vs->m3u8_created = 1;
>     if (!hls->master_m3u8_created) {
> @@ -1108,14 +1108,14 @@ static int create_master_playlist(AVFormatContext *s,
>         vs = &(hls->var_streams[i]);
> 
>         m3u8_name_size = strlen(vs->m3u8_name) + 1;
> -        m3U8_rel_name = av_malloc(m3u8_name_size);
> -        if (!m3U8_rel_name) {
> +        m3u8_rel_name = av_malloc(m3u8_name_size);
> +        if (!m3u8_rel_name) {
>             ret = AVERROR(ENOMEM);
>             goto fail;
>         }
> -        av_strlcpy(m3U8_rel_name, vs->m3u8_name, m3u8_name_size);
> +        av_strlcpy(m3u8_rel_name, vs->m3u8_name, m3u8_name_size);
>         ret = get_relative_url(hls->master_m3u8_url, vs->m3u8_name,
> -                               m3U8_rel_name, m3u8_name_size);
> +                               m3u8_rel_name, m3u8_name_size);
>         if (ret < 0) {
>             av_log(NULL, AV_LOG_ERROR, "Unable to find relative URL\n");
>             goto fail;
> @@ -1145,7 +1145,7 @@ static int create_master_playlist(AVFormatContext *s,
>         if (!bandwidth) {
>             av_log(NULL, AV_LOG_WARNING,
>                     "Bandwidth info not available, set audio and video bitrates\n");
> -            av_freep(&m3U8_rel_name);
> +            av_freep(&m3u8_rel_name);
>             continue;
>         }
> 
> @@ -1153,14 +1153,14 @@ static int create_master_playlist(AVFormatContext *s,
>         if (vid_st && vid_st->codecpar->width > 0 && vid_st->codecpar->height > 0)
>             avio_printf(master_pb, ",RESOLUTION=%dx%d", vid_st->codecpar->width,
>                     vid_st->codecpar->height);
> -        avio_printf(master_pb, "\n%s\n\n", m3U8_rel_name);
> +        avio_printf(master_pb, "\n%s\n\n", m3u8_rel_name);
> 
> -        av_freep(&m3U8_rel_name);
> +        av_freep(&m3u8_rel_name);
>     }
> fail:
>     if(ret >=0)
>         hls->master_m3u8_created = 1;
> -    av_freep(&m3U8_rel_name);
> +    av_freep(&m3u8_rel_name);
>     ff_format_io_close(s, &master_pb);
>     return ret;
> }
> -- 
> 1.9.1
> 
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

patchset LGTM



Thanks
Jeyapal, Karthick Nov. 24, 2017, 3:15 a.m. UTC | #2 
Thanks for pushing this patchset.

Regards,
Karthick

On 11/22/17, 1:43 PM, "刘歧" <lq@chinaffmpeg.org> wrote:


> 在 2017年11月22日，16:08，Karthick J <kjeyapal@akamai.com> 写道：

> 

> ---

> libavformat/hlsenc.c | 18 +++++++++---------

> 1 file changed, 9 insertions(+), 9 deletions(-)

> 

> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c

> index 525605b..611cc99 100644

> --- a/libavformat/hlsenc.c

> +++ b/libavformat/hlsenc.c

> @@ -1074,7 +1074,7 @@ static int create_master_playlist(AVFormatContext *s,

>     AVDictionary *options = NULL;

>     unsigned int i, j;

>     int m3u8_name_size, ret, bandwidth;

> -    char *m3U8_rel_name;

> +    char *m3u8_rel_name;

> 

>     input_vs->m3u8_created = 1;

>     if (!hls->master_m3u8_created) {

> @@ -1108,14 +1108,14 @@ static int create_master_playlist(AVFormatContext *s,

>         vs = &(hls->var_streams[i]);

> 

>         m3u8_name_size = strlen(vs->m3u8_name) + 1;

> -        m3U8_rel_name = av_malloc(m3u8_name_size);

> -        if (!m3U8_rel_name) {

> +        m3u8_rel_name = av_malloc(m3u8_name_size);

> +        if (!m3u8_rel_name) {

>             ret = AVERROR(ENOMEM);

>             goto fail;

>         }

> -        av_strlcpy(m3U8_rel_name, vs->m3u8_name, m3u8_name_size);

> +        av_strlcpy(m3u8_rel_name, vs->m3u8_name, m3u8_name_size);

>         ret = get_relative_url(hls->master_m3u8_url, vs->m3u8_name,

> -                               m3U8_rel_name, m3u8_name_size);

> +                               m3u8_rel_name, m3u8_name_size);

>         if (ret < 0) {

>             av_log(NULL, AV_LOG_ERROR, "Unable to find relative URL\n");

>             goto fail;

> @@ -1145,7 +1145,7 @@ static int create_master_playlist(AVFormatContext *s,

>         if (!bandwidth) {

>             av_log(NULL, AV_LOG_WARNING,

>                     "Bandwidth info not available, set audio and video bitrates\n");

> -            av_freep(&m3U8_rel_name);

> +            av_freep(&m3u8_rel_name);

>             continue;

>         }

> 

> @@ -1153,14 +1153,14 @@ static int create_master_playlist(AVFormatContext *s,

>         if (vid_st && vid_st->codecpar->width > 0 && vid_st->codecpar->height > 0)

>             avio_printf(master_pb, ",RESOLUTION=%dx%d", vid_st->codecpar->width,

>                     vid_st->codecpar->height);

> -        avio_printf(master_pb, "\n%s\n\n", m3U8_rel_name);

> +        avio_printf(master_pb, "\n%s\n\n", m3u8_rel_name);

> 

> -        av_freep(&m3U8_rel_name);

> +        av_freep(&m3u8_rel_name);

>     }

> fail:

>     if(ret >=0)

>         hls->master_m3u8_created = 1;

> -    av_freep(&m3U8_rel_name);

> +    av_freep(&m3u8_rel_name);

>     ff_format_io_close(s, &master_pb);

>     return ret;

> }

> -- 

> 1.9.1

> 

> _______________________________________________

> ffmpeg-devel mailing list

> ffmpeg-devel@ffmpeg.org

> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


patchset LGTM



Thanks
diff mbox

Patch

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index 525605b..611cc99 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -1074,7 +1074,7 @@  static int create_master_playlist(AVFormatContext *s,
     AVDictionary *options = NULL;
     unsigned int i, j;
     int m3u8_name_size, ret, bandwidth;
-    char *m3U8_rel_name;
+    char *m3u8_rel_name;
 
     input_vs->m3u8_created = 1;
     if (!hls->master_m3u8_created) {
@@ -1108,14 +1108,14 @@  static int create_master_playlist(AVFormatContext *s,
         vs = &(hls->var_streams[i]);
 
         m3u8_name_size = strlen(vs->m3u8_name) + 1;
-        m3U8_rel_name = av_malloc(m3u8_name_size);
-        if (!m3U8_rel_name) {
+        m3u8_rel_name = av_malloc(m3u8_name_size);
+        if (!m3u8_rel_name) {
             ret = AVERROR(ENOMEM);
             goto fail;
         }
-        av_strlcpy(m3U8_rel_name, vs->m3u8_name, m3u8_name_size);
+        av_strlcpy(m3u8_rel_name, vs->m3u8_name, m3u8_name_size);
         ret = get_relative_url(hls->master_m3u8_url, vs->m3u8_name,
-                               m3U8_rel_name, m3u8_name_size);
+                               m3u8_rel_name, m3u8_name_size);
         if (ret < 0) {
             av_log(NULL, AV_LOG_ERROR, "Unable to find relative URL\n");
             goto fail;
@@ -1145,7 +1145,7 @@  static int create_master_playlist(AVFormatContext *s,
         if (!bandwidth) {
             av_log(NULL, AV_LOG_WARNING,
                     "Bandwidth info not available, set audio and video bitrates\n");
-            av_freep(&m3U8_rel_name);
+            av_freep(&m3u8_rel_name);
             continue;
         }
 
@@ -1153,14 +1153,14 @@  static int create_master_playlist(AVFormatContext *s,
         if (vid_st && vid_st->codecpar->width > 0 && vid_st->codecpar->height > 0)
             avio_printf(master_pb, ",RESOLUTION=%dx%d", vid_st->codecpar->width,
                     vid_st->codecpar->height);
-        avio_printf(master_pb, "\n%s\n\n", m3U8_rel_name);
+        avio_printf(master_pb, "\n%s\n\n", m3u8_rel_name);
 
-        av_freep(&m3U8_rel_name);
+        av_freep(&m3u8_rel_name);
     }
 fail:
     if(ret >=0)
         hls->master_m3u8_created = 1;
-    av_freep(&m3U8_rel_name);
+    av_freep(&m3u8_rel_name);
     ff_format_io_close(s, &master_pb);
     return ret;
 }