[FFmpeg-devel] lavf/hlsenc: Fix mixed declarations and code

Submitted by Mark Thompson on Oct. 30, 2018, 11:20 p.m.

Details

Message ID c71324fa-478e-2650-8a50-c6dd9c58e4c5@jkqxz.net
State New
Headers show

Commit Message

Mark Thompson Oct. 30, 2018, 11:20 p.m.
---
 libavformat/hlsenc.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

Comments

Steven Liu Nov. 27, 2018, 2:11 p.m.
> On Oct 31, 2018, at 07:20, Mark Thompson <sw@jkqxz.net> wrote:
> 
> ---
> libavformat/hlsenc.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
> index f8f060d065..73282ed31a 100644
> --- a/libavformat/hlsenc.c
> +++ b/libavformat/hlsenc.c
> @@ -2348,26 +2348,31 @@ static int hls_write_trailer(struct AVFormatContext *s)
>             return AVERROR(ENOMEM);
>         }
>         if ( hls->segment_type == SEGMENT_TYPE_FMP4) {
> +            int range_length;
> +
>             if (!vs->init_range_length) {
> +                uint8_t *buffer;
> +                int byterange_mode;
> +
>                 av_write_frame(vs->avf, NULL); /* Flush any buffered data */
>                 avio_flush(oc->pb);
> 
> -                uint8_t *buffer = NULL;
> -                int range_length = avio_close_dyn_buf(oc->pb, &buffer);
> +                buffer = NULL;
> +                range_length = avio_close_dyn_buf(oc->pb, &buffer);
>                 avio_write(vs->out, buffer, range_length);
>                 av_free(buffer);
>                 vs->init_range_length = range_length;
>                 avio_open_dyn_buf(&oc->pb);
>                 vs->packets_written = 0;
>                 vs->start_pos = range_length;
> -                int byterange_mode = (hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size > 0);
> +                byterange_mode = (hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size > 0);
>                 if (!byterange_mode) {
>                     ff_format_io_close(s, &vs->out);
>                     hlsenc_io_close(s, &vs->out, vs->base_output_dirname);
>                 }
>             }
> 
> -            int range_length = 0;
> +            range_length = 0;
>             if (!(hls->flags & HLS_SINGLE_FILE)) {
>                 ret = hlsenc_io_open(s, &vs->out, vs->avf->url, NULL);
>                 if (ret < 0) {
> -- 
> 2.19.1
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

LGTM

Thanks
Steven

Patch hide | download patch | download mbox

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index f8f060d065..73282ed31a 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -2348,26 +2348,31 @@  static int hls_write_trailer(struct AVFormatContext *s)
             return AVERROR(ENOMEM);
         }
         if ( hls->segment_type == SEGMENT_TYPE_FMP4) {
+            int range_length;
+
             if (!vs->init_range_length) {
+                uint8_t *buffer;
+                int byterange_mode;
+
                 av_write_frame(vs->avf, NULL); /* Flush any buffered data */
                 avio_flush(oc->pb);
 
-                uint8_t *buffer = NULL;
-                int range_length = avio_close_dyn_buf(oc->pb, &buffer);
+                buffer = NULL;
+                range_length = avio_close_dyn_buf(oc->pb, &buffer);
                 avio_write(vs->out, buffer, range_length);
                 av_free(buffer);
                 vs->init_range_length = range_length;
                 avio_open_dyn_buf(&oc->pb);
                 vs->packets_written = 0;
                 vs->start_pos = range_length;
-                int byterange_mode = (hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size > 0);
+                byterange_mode = (hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size > 0);
                 if (!byterange_mode) {
                     ff_format_io_close(s, &vs->out);
                     hlsenc_io_close(s, &vs->out, vs->base_output_dirname);
                 }
             }
 
-            int range_length = 0;
+            range_length = 0;
             if (!(hls->flags & HLS_SINGLE_FILE)) {
                 ret = hlsenc_io_open(s, &vs->out, vs->avf->url, NULL);
                 if (ret < 0) {