[FFmpeg-cvslog] libavformat/hls: correct indentation

Nachiket Tarate git at videolan.org
Wed Oct 13 07:48:27 EEST 2021


ffmpeg | branch: master | Nachiket Tarate <nachiket.programmer at gmail.com> | Wed Sep 22 00:30:28 2021 +0530| [f14adb051697a6085bfa17980d6168bdca22692c] | committer: Steven Liu

libavformat/hls: correct indentation

Signed-off-by: Nachiket Tarate <nachiket.programmer at gmail.com>
Signed-off-by: Steven Liu <lq at chinaffmpeg.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f14adb051697a6085bfa17980d6168bdca22692c
---

 libavformat/hls.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/libavformat/hls.c b/libavformat/hls.c
index 5c76fa693f..52a031ed54 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -2051,23 +2051,23 @@ static int hls_read_header(AVFormatContext *s)
                 if (in_fmt->raw_codec_id == pls->audio_setup_info.codec_id)
                     break;
         } else {
-        pls->ctx->probesize = s->probesize > 0 ? s->probesize : 1024 * 4;
-        pls->ctx->max_analyze_duration = s->max_analyze_duration > 0 ? s->max_analyze_duration : 4 * AV_TIME_BASE;
-        pls->ctx->interrupt_callback = s->interrupt_callback;
-        url = av_strdup(pls->segments[0]->url);
-        ret = av_probe_input_buffer(&pls->pb.pub, &in_fmt, url, NULL, 0, 0);
-        if (ret < 0) {
-            /* Free the ctx - it isn't initialized properly at this point,
-             * so avformat_close_input shouldn't be called. If
-             * avformat_open_input fails below, it frees and zeros the
-             * context, so it doesn't need any special treatment like this. */
-            av_log(s, AV_LOG_ERROR, "Error when loading first segment '%s'\n", url);
-            avformat_free_context(pls->ctx);
-            pls->ctx = NULL;
+            pls->ctx->probesize = s->probesize > 0 ? s->probesize : 1024 * 4;
+            pls->ctx->max_analyze_duration = s->max_analyze_duration > 0 ? s->max_analyze_duration : 4 * AV_TIME_BASE;
+            pls->ctx->interrupt_callback = s->interrupt_callback;
+            url = av_strdup(pls->segments[0]->url);
+            ret = av_probe_input_buffer(&pls->pb.pub, &in_fmt, url, NULL, 0, 0);
+            if (ret < 0) {
+                /* Free the ctx - it isn't initialized properly at this point,
+                * so avformat_close_input shouldn't be called. If
+                * avformat_open_input fails below, it frees and zeros the
+                * context, so it doesn't need any special treatment like this. */
+                av_log(s, AV_LOG_ERROR, "Error when loading first segment '%s'\n", url);
+                avformat_free_context(pls->ctx);
+                pls->ctx = NULL;
+                av_free(url);
+                return ret;
+            }
             av_free(url);
-            return ret;
-        }
-        av_free(url);
         }
 
         if (seg && seg->key_type == KEY_SAMPLE_AES) {
@@ -2121,7 +2121,7 @@ static int hls_read_header(AVFormatContext *s)
                 pls->ctx->nb_streams == 1)
                 ret = ff_hls_senc_parse_audio_setup_info(pls->ctx->streams[0], &pls->audio_setup_info);
             else
-            ret = avformat_find_stream_info(pls->ctx, NULL);
+                ret = avformat_find_stream_info(pls->ctx, NULL);
 
             if (ret < 0)
                 return ret;



More information about the ffmpeg-cvslog mailing list