From patchwork Fri Jul 16 17:20:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nachiket Tarate X-Patchwork-Id: 28944 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp1991758ios; Fri, 16 Jul 2021 10:50:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxc1C8IodU+sK5leI4cq39AHaVl6gOFgTFKXTRHfCsQ1iU/kvGYfQjnFPPTXLvRQSI94bMZ X-Received: by 2002:aa7:c641:: with SMTP id z1mr7059730edr.289.1626457824392; Fri, 16 Jul 2021 10:50:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626457824; cv=none; d=google.com; s=arc-20160816; b=VhTlh6sv4Eu7tlWjzCadhB74Jq4HrN+1giiL6oQv2yXHWS689c6/mzENoR/GbX07US DoOo8dHtlNy3TOPcj/5KX32+EixziYfQWlul5c9M6eJefCE3jREzsQ+n005bITGObhzQ +M80oVm/fLd1YpTxt6yIy3ge0+AhmS6DPdUrnq/xVJBBvYDEl705Zp2RTXc+3khrkKCW 4g3pPLHB5sIvwyfKHM6BXsrTxE8t+dQTq83H34iPJA2sBPKgMP242GK/HXE22f1NdMXw xOQBFnSEA8bBb1EdxGWmMbhZCAdkWIHBOgTCGeL2J7ts0Q+A1ey/rVijjtPFJUPaC9PW cXJw== 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=wOanLjywALz3WUuYB+6l2zgBKJDlCCX5wqaicXbVVyE=; b=z/1EIm8FAuNeu+zQpc1948Org8RtxFxYF1U1l7EoC69zO5RwOWvAwcZf3rWhHc/ylP DfAbnfCpkjT7GDslkONrIWqsidTBztaOtHR2s5kLKQ9vUotGU8AsZupqPH2xTCG71FvE 9Oh2bAMGzQbpQUDsoaLxXmwOih7rvrZaoGpYRVtfT4WLMdnGdVxIl0JHuWdZCEY4ZAkQ lVLKyT3pb5KlVrKcnWhzHQn/aBIIsoDCe9UiD2BK6jNr9TMbddjGllhMi2l/0Ip9FnHa JHwuDPk6J2P5YovVhO/2PQOGc0bPkBUyLZeiDmOlKjaWAQiECPSBPv0ZWiKpCu/Cj/RB uyCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=o+FJjeqX; 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 jp3si11588414ejb.706.2021.07.16.10.50.23; Fri, 16 Jul 2021 10:50:24 -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=20161025 header.b=o+FJjeqX; 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 86334689EDA; Fri, 16 Jul 2021 20:50:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f53.google.com (mail-vs1-f53.google.com [209.85.217.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B6738689EDA for ; Fri, 16 Jul 2021 20:50:13 +0300 (EEST) Received: by mail-vs1-f53.google.com with SMTP id o19so3307122vsn.3 for ; Fri, 16 Jul 2021 10:50:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=erHUTjZLlzj5ftXMrMYW8XK3/GV8xXASVU3OEtacL9s=; b=o+FJjeqX3OaoKaDmRRyF3qkcF4SrlDdSs+VMusQp3fKKBeYoQZIzI4yrSPeOd/Xxvi 4v5yTOR7tm7cp4G1cgUKVCv3kgZysPQL5QZQUyBURNRa8pCFvvY6KOVuHTO8d7n3Bnyo aTowj3kEud8vcn67Rhh1NXtvYrH2uSTvhhtxCDhqQ9vHGARgsK8I6P5Pcst+YK+IMceZ tFINLTRtUxFQc1XRqG5pRYTdtFvxh56OjdQVnSvKFVu87kjMV/6SBLzQJap1Eu7y4RkA uUTu5T4yYBgE49PQoQYckIg4bUihsLr49QVA2xMyFmwbodDtIXIFFcy9y/t7fXTrUNvK B6DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=erHUTjZLlzj5ftXMrMYW8XK3/GV8xXASVU3OEtacL9s=; b=ha/hRkiyAidX5OEIkbJffIdP3Hizw74WbysrY7J2amf2Cgv+KT2hI7fUsgGp3957x/ /qHZqNNixMNbVEEHa0EN6+VLZ+E/lmxe1w0FDWMAfEteFOouC9sBY/MWSzvj/BklgZ/i lr1CMUhNOf35Ti6VtvsKsPftNh0WoGCN8HY+tdZ4iHxe8PVp0yhr3FteIFmtVi91xqTj a6nLGJC8F5Ttyea5ZmNnHAMxK9VoDchOb4F/DGovhOakp+MF4B1X95fgSIm6c9LAy0PV +C8k/p0ny3TgHnG2FAmRp0crdHLwtvBOydVFnNMoJprLwsyanhv6V5FawSCMAVU4710O 1cew== X-Gm-Message-State: AOAM533saoIJXN1ZLoXF3eha568OTsrUNCfZhVqs8EFl3dhhDhp8QEG6 uqrcXHX883J+9bhaO1KlMyPS2UL25D/t/wOc X-Received: by 2002:a05:6a00:bd6:b029:329:9432:9660 with SMTP id x22-20020a056a000bd6b029032994329660mr11459368pfu.22.1626456070788; Fri, 16 Jul 2021 10:21:10 -0700 (PDT) Received: from localhost.localdomain ([2401:4900:30cb:56ce:2598:843e:f055:e9fc]) by smtp.gmail.com with ESMTPSA id u185sm10975435pfu.49.2021.07.16.10.21.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jul 2021 10:21:10 -0700 (PDT) From: Nachiket Tarate To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Jul 2021 22:50:54 +0530 Message-Id: <20210716172054.5573-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: yUpi5oPiBFn7 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 022dae0391..7e457281f4 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, &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, &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;