From patchwork Tue Sep 21 18:42:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nachiket Tarate X-Patchwork-Id: 30428 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2704464iob; Tue, 21 Sep 2021 11:42:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwjfHvDNafEDuEWZ2zTLm3xinWsCAksjeVK0KHGrEiaD61axEglpt84FjBjiLivF4MGYYOf X-Received: by 2002:a17:906:4ad1:: with SMTP id u17mr25165981ejt.407.1632249773732; Tue, 21 Sep 2021 11:42:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632249773; cv=none; d=google.com; s=arc-20160816; b=LxugcgrVFoQV6FVTdh7Z4kw/tcapYQqM6GWKjB6dch1vkdMcTivwvPBtYknEGaLXvX AESy3iQhxKlozNTSPHhcOuD9Lxb6u0YNMLvGaPgh8hesj+5ktYiPUWHV+OtiM5PmelZS dJJeRqYKLKbjPq/fex8zEfbg/heQF3HyOPUu9jTGfgrio3qgLWbDC75cMuYgkGma9e1s vqWoiL6G4DgRDMRHb7cdTHdZML1SQApRnYTjBgDFbo0fCg87qc+76zH07EBVC1r1Xh08 e7vo0wmLY7jw5rn64upk2GL+OuNfgk43n3kbHuXy8fgsnF/eETtPPb1kTzsU0BYpo2lR wWfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=BFKRhps4GAhuT3iks4c6DGrifP0jGKL1PX+bRVeqc9I=; b=lzYDVsG8S/91SlwDa9CudFA7RJRzUG3ee6TUJYO5x4jdxur4vbF+GYXBtMbGqmcMFz 1J7nP8xaS9gVZZMRmuMoBFmgQre0JfztdEF+Go6NwAaiM/8Y1TJNCIRUvPCuyneEYGQN 13gEzl9QczsncYcmtk26RYQx78cgkkzlt2QpmGcqtKwpGVpKbND67HYkWgse7dMnu43M Jk0WTnFeJJVlATKrGDxbd9F5s0rGA5srbxm/8Qu36tv79CrFcOS9eV2DPOYTz5e2LsIU FkhHtAnFcSgqFhlq4bpw3Sk82g6vAJebdTimTfVpOYbeIH7bgTa1yzCcv8/RcvQR9zL3 JTEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=QcZoUNwl; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ay23si3483902edb.134.2021.09.21.11.42.53; Tue, 21 Sep 2021 11:42:53 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=QcZoUNwl; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1EC6468B08E; Tue, 21 Sep 2021 21:42:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 145E268AF00 for ; Tue, 21 Sep 2021 21:42:45 +0300 (EEST) Received: by mail-pj1-f48.google.com with SMTP id lb1-20020a17090b4a4100b001993f863df2so267546pjb.5 for ; Tue, 21 Sep 2021 11:42:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id; bh=w37WisqTtz02SKVRUjryWWoDBp/PUHFYZijvDqNqIYY=; b=QcZoUNwlVtnX/R1j8Ivf3Fmcx1YX/4/rFZ8UVbr+Fd9D5HV6MVgfzf5kMTMP6h97xk YGL8NisgiGW/BtFslqlA3m9sAPVKSehXsYfwOm8kSTsoNnmufnx3BxBCUPAhiBowcnM7 5FnI1C/X52a8OPHzuWT1yZ6bpMvpu76FZgoEE2BoWISAvi0uvdUPHqT37oV9BevW1Otg s9s6XKLWuu/JZnf7ZDcx51ibVt37ZBrG7ZTWPJ/AYr52ql2oQyGw3JQh+UK4NbuW7X0q auhQVqkGeYGaYUV8EnUtuWPES+MBgxKvqejBkikYkyMaokxgDOV01SIldBLWhzf1D9wu bbgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id; bh=w37WisqTtz02SKVRUjryWWoDBp/PUHFYZijvDqNqIYY=; b=MdYXnUpXh5qzbIr8xGo10KzTBfxEgs/LijptQoni7dRm4whypeCLkYO7fo6Gcq4oy4 cJwovWtxBKlDTpZe1qIIuWX02UIcsAYRGL106gVD9XskQB3KChmTv/HdyqRLMCMaCDnU u6W5iuOzOaqE7W9/o7Ew2kp/iXZsDvRKPnPUNRxo2lBw9kxLc3A8g1JZ3WMG5Kh3WxJy ssnKxnPW8MlE+zcZrbH1mRBnH4OyWtrD3poS8W4MJ2jz1YzXhyFsbDlNUae0KckUUvH9 qVjsmN7L+/+ffEVKDu1hDOT1zwKd51e+vjs2aVP9G3DdAaNxxiCcKCeN8xDIohC6WaIq sG0g== X-Gm-Message-State: AOAM5330pKe5BNIr6bBEW0BDn8YHqBKp3wL5ggh/rvkyhQUlZIwYOd0P dp1OvaDBiN41it31BbkH9J9IauISeXk= X-Received: by 2002:a17:90a:34b:: with SMTP id 11mr6983972pjf.102.1632249763206; Tue, 21 Sep 2021 11:42:43 -0700 (PDT) Received: from localhost.localdomain ([2401:4900:5023:907:6d04:a3b6:841a:1d61]) by smtp.gmail.com with ESMTPSA id g3sm21009767pgf.1.2021.09.21.11.42.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Sep 2021 11:42:42 -0700 (PDT) From: Nachiket Tarate To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Sep 2021 00:12:28 +0530 Message-Id: <20210921184228.3328-1-nachiket.programmer@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 4/4] libavformat/hls: correct indentation X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Nvftqs1Yf98d Signed-off-by: Nachiket Tarate --- libavformat/hls.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 0feddb06e4..3c34d69538 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;