From patchwork Fri Feb 28 09:53:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17960 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6214:1865:0:0:0:0 with SMTP id eh5csp1913155qvb; Fri, 28 Feb 2020 01:54:27 -0800 (PST) X-Google-Smtp-Source: APXvYqx989ElESotZiQ5x+gwsnx9wyY5vTtaSIDXtsMynKmTh6BUtfwRdgfo/jByP/vzG7J2mldg X-Received: by 2002:a50:f10a:: with SMTP id w10mr591134edl.326.1582883667824; Fri, 28 Feb 2020 01:54:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582883667; cv=none; d=google.com; s=arc-20160816; b=KJZiFfN0JtbqUcaBNnb5ciDOfJfl7xEdIKwUmO/8D7gzdaFb+HyoIPiaYqxc2Az4ji 7zYo42mCTnFmlSS4YR8DOSGaosnc0f7+pj2nmsAHJn4ZN49wj7mPLVnbKNdZwEmAvDEm Ywo3gL079AWUdpH+97dByj8Qj08Szs6XaIYn7BlvEqPSyVKfauTjhsOGtn59Lui4MT64 0wn0XsnVXl8ZmCfiNq8Wwb/qf4Jm1L26NDCP5gZCgKHugevmMHaM/jtWZ3YTKz4P0dcE GURbR1zBTAlMqIszLpjdlLAhDlV4VSA9woP2HjxU+dfHPFGHGdWYx+KkxjOZc4FSp87H MGGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=TqqJqlW0WrxZHgwkX0F9hXy0FAzhcBXQRwK6Yy81XhU=; b=umztyThYeoJ7pL81wm5Mgi9HyW4J/u/vyQQmkZuRyG8e4QgqDGnWDrwftqL5JS3eJt x60dNmJptvH/VXAoWBxhKPfu1tag2k6Vo/5jTYWRcfLNRDoHi7SqTuYA7VzD4nys3bez dF503nWgAUfY8q4ivK+73XchIu5wcZzvdiocViPS0S+2obqxI68/4U1MAe8iSDUiBYVS qZHCnVYO9yz73UuDd9gewUrjUMuV90nwrsV2xSS0U/tfPbmH2hJwO28DHaawhg4H8OvJ UOaKJ/3E9i+YxH6+GAatPJaZD8eUWoJVVxqzuWfub3s9hGq4LyT7Y1J/TYzj2gThDueI ddxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=pXkf25KK; 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 c25si1533689eja.307.2020.02.28.01.54.27; Fri, 28 Feb 2020 01:54:27 -0800 (PST) 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=pXkf25KK; 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 D2A0468B560; Fri, 28 Feb 2020 11:54:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0971568B4B0 for ; Fri, 28 Feb 2020 11:53:55 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id d138so898408wmd.5 for ; Fri, 28 Feb 2020 01:53:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L2vbMezDCNzVTWSuqNCdh32rMIusvEXGN5Z2dRhyrEA=; b=pXkf25KK4Nb3i4D/WhkYz0Lxx6JlzQgy1cbSaupeiVNP9JX3gbjtdnAuJGaJTkyN+l C3lDaQkRiI50pWMnZKbroLg9UthblEQPB0ZaHQHtv0T4go4rt3+oY1BgtX7btqM7opwG VcJxEuk16Nsk8hzidRdh3Z4q1vl7AsTCAZGLJSFpElCxft8SLFU9602wn/cIL0dZnsGs 3+wFxN1QVY2ULFaZW1strgQq4J0V7wMvGE6jsuF9iSy1JJlGFZ0ZIKHtbqvqXgKLKpAu qa7IgegyDlhgq97yMYnKYfURFHN8fSkKDDQEaGlbzS3IzlfS4gqnR7xZNh+uxuKEr+u9 Ej0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L2vbMezDCNzVTWSuqNCdh32rMIusvEXGN5Z2dRhyrEA=; b=XoRZtV2UXdpymDkBXT5A05PU+iOwuWvo153PzjZX/4BmxS4SajI4AXvzABehwuYUFO Od001JO9rzFVCHbLTcaHAB6JQG4fZhCssEe20j5auRvLG9ve1kgrUJAauXh8sY7keAuw 2PmJP9XJOkS5XemOapG9Cbr7paA+QIIKmsvUHvgOBy/siU5tzTqoH3KKBA7zZXDKJmoC 6biSZpl+pbE/52lzZxmm2RDlR/M5NypzBCJt2HIcw08O7XyU4SfPiwFhDqZBTiKOmtMf RZbThulkdRNS8936h1WpAQkaG2rVior31YbXIJzEwuEh6LBvZnm3lwdApxJoSuu2fYlb 1Yxg== X-Gm-Message-State: APjAAAWqOGb3xd0sjb+I4lkVHJXXdk6HM3J5dYzFT/j56BDMOCHy7Pes XrhHoHiqmb9q6kYefu1dAgsqntyh X-Received: by 2002:a05:600c:218a:: with SMTP id e10mr4016628wme.6.1582883634230; Fri, 28 Feb 2020 01:53:54 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1ab4b.dynamic.kabel-deutschland.de. [188.193.171.75]) by smtp.gmail.com with ESMTPSA id c8sm1453360wru.7.2020.02.28.01.53.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2020 01:53:53 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Feb 2020 10:53:19 +0100 Message-Id: <20200228095321.7222-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200228095321.7222-1-andreas.rheinhardt@gmail.com> References: <20200228095321.7222-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 5/7] avformat/hlsenc: Localize initialization of subtitle streams X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: pzwTTTNh20Mx Content-Length: 2071 Before this commit, the checks were unnecessarily scattered. Signed-off-by: Andreas Rheinhardt --- Now not moving variables into a smaller scope. libavformat/hlsenc.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 4628ea15c7..e3a310dbc1 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2798,13 +2798,6 @@ static int hls_init(AVFormatContext *s) goto fail; } - if (vs->has_subtitle) { - vs->vtt_oformat = av_guess_format("webvtt", NULL, NULL); - if (!vs->vtt_oformat) { - ret = AVERROR_MUXER_NOT_FOUND; - goto fail; - } - } if (hls->segment_filename) { ret = format_name(hls->segment_filename, &vs->basename, i, vs->varname); if (ret < 0) @@ -2899,6 +2892,9 @@ static int hls_init(AVFormatContext *s) goto fail; if (vs->has_subtitle) { + vs->vtt_oformat = av_guess_format("webvtt", NULL, NULL); + if (!vs->vtt_oformat) + return AVERROR_MUXER_NOT_FOUND; if (hls->flags & HLS_SINGLE_FILE) vtt_pattern = ".vtt";