From patchwork Mon Dec 16 00:04:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16822 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C881444A07A for ; Mon, 16 Dec 2019 02:04:59 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B689368AC40; Mon, 16 Dec 2019 02:04:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8DF4268AA4A for ; Mon, 16 Dec 2019 02:04:52 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id q9so4819642wmj.5 for ; Sun, 15 Dec 2019 16:04:52 -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=bSj67j4H49gPXMbwX+t/KCkZXIdZ10nmkaaJO0zOux4=; b=rqPutX09lvZ/T/s3BmsJn/h98HrMUhJvUzc4y6nwa/WaYee8pBmnpNF2ZZAZJrxlHq +PEfmYvZ/90XvGPh2YA1ITMrJ+wnDfuiQ/xhQ1LgTxqYK/MZinfPfLsz8MNoyHP1dPRc +Ow1HtmqlAj6NFzr9GCgwYUm4H3X4lBmK+tTIZ4aLbCDrt2Y2m8wFQUAL4kd/KG/64pQ VxfQuIEElproH7iIvk8piAL0CLZ2sl9dMlDt7+3PGi+TX2SWMAnTMSG9iB3808aVqHsP 67jv/XqFSOI+1wIqDB6wOWcr5az/uTy778StETXrige58gqhUTv/4FNMAOJFjWpOjx74 SKsQ== 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=bSj67j4H49gPXMbwX+t/KCkZXIdZ10nmkaaJO0zOux4=; b=p+XJOPpkUbXm8qwOAewILTJTEyn76KFoCE2aCGLWQmR4DPa5V9/hDKAkNv8+uMPNT+ sYe/KmbLzTBIfNrs4nElcLMbHRxrRhSlzyXSAB7hUjm4OHcm4/pSuscq4LYG4wXSNpzU 8YtNDoOr7L2a+KNeZocw2HenS0vY1g3FfJvD7tRKiYpsQQOC19kyB3YsJgFJgauy7j9T Yc0gRqcSxs6dMSEBGQNzCBkdQV0sL6eQDwoq6VALQS1WpUqmnWIUkibrHPqAYpB5nU0Z XaeGWbX/2xgC0uaWeQHjrmxdYcgV21B1kDO/alc8ahVFvNMimk81FamULPGNV1s+N96Q zJYw== X-Gm-Message-State: APjAAAU9JYGIOosgJ4KhnCob71Tvf3Gjagkao/EqpmdipJoXdvVaGeO4 M+HPhWu1a3CjP86ozuFYivOZAlgU X-Google-Smtp-Source: APXvYqy4Oywsn/WuqJ6S5WeSWy4ed6DBt7WsA9KAa62gedyChWwPPnmk0OZOoHaM7HZkDXci45UeVQ== X-Received: by 2002:a1c:4c10:: with SMTP id z16mr28373262wmf.136.1576454691908; Sun, 15 Dec 2019 16:04:51 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id s1sm19214442wmc.23.2019.12.15.16.04.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2019 16:04:51 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Dec 2019 01:04:16 +0100 Message-Id: <20191216000418.24707-15-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191216000418.24707-1-andreas.rheinhardt@gmail.com> References: <20191216000418.24707-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 14/16] 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" Signed-off-by: Andreas Rheinhardt --- libavformat/hlsenc.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index c612c3bbb8..16595f02cd 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2684,9 +2684,7 @@ static int hls_init(AVFormatContext *s) VariantStream *vs = NULL; int basename_size = 0; const char *pattern_localtime_fmt = get_default_pattern_localtime_fmt(s); - const char *vtt_pattern = "%d.vtt"; char *p = NULL; - int vtt_basename_size = 0; int http_base_proto = ff_is_http_proto(s->url); int fmp4_init_filename_len = strlen(hls->fmp4_init_filename) + 1; @@ -2817,13 +2815,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) @@ -2918,6 +2909,12 @@ static int hls_init(AVFormatContext *s) goto fail; if (vs->has_subtitle) { + const char *vtt_pattern = "%d.vtt"; + int vtt_basename_size; + + 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";