From patchwork Sun Aug 15 18:27:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nachiket Tarate X-Patchwork-Id: 29545 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1403141iov; Sun, 15 Aug 2021 11:27:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzwtXAhRxMffSKtxGpwVTd2yIRNogK3EJeNcft22097RPA7+0lOcWWwXpFGZ0fBRL08x6Eg X-Received: by 2002:a05:6402:2554:: with SMTP id l20mr2173973edb.252.1629052069627; Sun, 15 Aug 2021 11:27:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629052069; cv=none; d=google.com; s=arc-20160816; b=XtvFMaaDElI8+GFo3jCNZXbUpp0HRbvpXLrchIeAtjW/i0/qqW7wV50FAroycKa5GL mB58W26hJohbdN5wZZveflU7l+MYR1R94QqN93MIirgJf3qmg9P0SeGa1c1MQV/HYnB8 fKGMrtie02WGI1t40diCp2hk7Dt4Nqzk8hhpCVWPMR0sSodePlJnQofjtPpkbyZSaIaa GNob9JG7DM3eNCDa15IRUuL+VdJaeJwlsKIGDnPLsFlg8DrLu9funuo1uqt3CPp6XmbO lSNpVSP8Y40V5CZCWTqsZgToDHwux/RpNxCig5CM3fw5jpPUQuQJSJJJqT6xSNvYWY9L V/Hg== 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=ou9EQ8bv/Je6+CFOF2bmg1uCM+y8Ypnys151/RNbs+NZtFG94DYUzjBUGhsBI/v71g DTBqpZZ3E4rHQZVVwd27Fszxchh/e4wKaH8oLE3PNSxvJiUh3zgB3xGc4PNuhLsxvVBp UsD7yDAaTCmiSQrZWgyIgaeTpeZWA1npmnQFfL6qqO1i0ryDF0HXqFHByoYiaiaxxqQ0 ToFmaBmSs1hS7AuJP85Qx1r5WAQ/0x3s77B1FJpgK4oPrEg8sXUVZVmyAc8n+khLMs7p RtOc8THO4E2BDV2uTRbgY+a+3/2h/ISUj5Y65YJAl9xXGafZTaKtBTNg3BuMzQP/b8x4 PhsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Tg6JYO2H; 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 g23si7568019ejk.552.2021.08.15.11.27.46; Sun, 15 Aug 2021 11:27:49 -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=Tg6JYO2H; 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 C1C3668A4A3; Sun, 15 Aug 2021 21:27:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F315689D1F for ; Sun, 15 Aug 2021 21:27:42 +0300 (EEST) Received: by mail-pl1-f181.google.com with SMTP id w6so11335124plg.9 for ; Sun, 15 Aug 2021 11:27:42 -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=Tg6JYO2HrJk5DQycjWCpwRd7hZekVKS3ZOjoQqXoQIhES6BNLyb0J1bJSgQiCcm1c8 PJy/hXSYIxWBNdmoEogh+AOsCbAEfTUiXu2k1cu0uegYJYlvtvYJdEIRHshidl+TZGWd NIS3G06RVftS4d1KXvW8qBjoqmavwAXyedh7hKwsmY7ZM/M1GByW07fV1ueupuy5gfXk fOj46mLJ1+thnGhMf8DfAB92cpmNVWlw4oUtVx5UCSVRA4pFuuTO953GzcYn+c/nII9L jCg7Rt4G4PeXr+RyFF/OA/aDz2m11D8Qq2ElPbWj1+gLzR3/Mr5/unUWNI1A6MMNsKd9 D1qQ== 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=LbNoCMFTn4SmK3fdtK0NhimU/kcMoZRL/FUsusKave/kcvTovtkk8uv9Pu9Avs86mP mAcohQOIxUFl5q0CaAwZdx+SIkjJIgQJvAOBY2Pdtrt1RAD8LYH7QYOZN3dscZpMdd4C alUwOjebIarVPq9ZW2DA2DuMlVPl96r+mjkCEu2qiqQsBpHn4mu81XP05dwKHqphSknV HwwFVIkDyW5HUSll03zj1TyvvpEhm205ri7DHmIm8TCac7gI19hrZ8YrfH60gEQmJ+Yj nFWQfSRjZZdO3+z9u/qrKI0aA7+uZsrqjsHv+UEX9Gw0auB3MVc44v0uJwp363v2sMyV URrg== X-Gm-Message-State: AOAM530DO2cSDmyaKeY5+cWRDt/gy7ZtLttpw6UU/3tgptoS5GE7qFjn gaVGbiMwIUTKAGR0Uh+1YeiHFtCVw5r5Dg== X-Received: by 2002:a65:4045:: with SMTP id h5mr12221323pgp.136.1629052060939; Sun, 15 Aug 2021 11:27:40 -0700 (PDT) Received: from localhost.localdomain ([2401:4900:4458:83cd:6c5d:85b2:b4ee:c5e3]) by smtp.gmail.com with ESMTPSA id 73sm1485138pfz.73.2021.08.15.11.27.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Aug 2021 11:27:40 -0700 (PDT) From: Nachiket Tarate To: ffmpeg-devel@ffmpeg.org Date: Sun, 15 Aug 2021 23:57:26 +0530 Message-Id: <20210815182726.12862-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: /GON1MTtjrvh 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;