From patchwork Mon Dec 16 00:04:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16820 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 E1DFF44A07A for ; Mon, 16 Dec 2019 02:04:57 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CC3F668ACD6; Mon, 16 Dec 2019 02:04:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A404968ABC8 for ; Mon, 16 Dec 2019 02:04:51 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id u2so4801991wmc.3 for ; Sun, 15 Dec 2019 16:04:51 -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=Qc9eSR0NSczF6Fdl4jicT6acE15ln6MA7efwM/aKP+w=; b=kse+YAkS6EovBkRRRu1Smg5RmdczDoXayz0yo+IwsELhwIlI9H3+tgDZeoIYCyGNuP Difwh3gVbmjacvQqi+th43twagudAE2w+8CcTKUYQrR4JrD9sMnOfxl45h5kfmoPVm6L NoTuDOAIDAIjjBxMsmaf92nLqBAZyn6Lssf9uDmeZy/f8qHfAfdsI1m7Z/Pc1I7cgYLE Z3wDjLZBCJiBAP4N5ETL63X1n8s/TIILh+L5Nl/11r8Ac+B5Xnc6lYrqzoAvKtpZ09PQ VKFaFWnAYuaKlqT/KP6vUIwkKO6gM2atQMeR1nqPwB8BoLb0m59cc0X3R50IihJHOk2i vATQ== 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=Qc9eSR0NSczF6Fdl4jicT6acE15ln6MA7efwM/aKP+w=; b=oyUgn53BqzgrdvppiGnNJyrVoDUq20NVi3VkIs6CeDWihwb1XYLCs815GqHZCdVp/l tMYAHgtJO8delvvqN/BgBDua9IPc8l7rBK/irACCvNsdVTsrGE6lCxIafvjjeW+UEr/X GVe70zV/UFb7OHQKf186j4zzgxVAQ9fmmEAZBSUx/xMHjvl2uibfg49pFGwA1T81HOtf n8vK+uzeMpVOUUBQ1Is+kfzt2ojiG1yVnu7ykaDB8H7qmoc/rs8khGYda1ndlj3CR+1U +dKWM4SgxcFSgwH08IQVYpzwbZQ9wpHjRJaEJzkok0GmEHhYlhF/zoFINWeEBnGVQKh6 0emA== X-Gm-Message-State: APjAAAWNF+b2INSOleV/aC8xwb74hHRhkMc6jGGOkN6Lx73tfLTCj/Pe 1r6lt6nycvI5plKSTEyMt14LjXzy X-Google-Smtp-Source: APXvYqxx0/RLmWzCJq2oyBuME0xnivPPMTDLJo29WyDHWTK+0wIjuWJQ5gdX0jSc868IHmzZ/6HU5g== X-Received: by 2002:a1c:ed0a:: with SMTP id l10mr25706488wmh.136.1576454690962; Sun, 15 Dec 2019 16:04:50 -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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2019 16:04:50 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Dec 2019 01:04:15 +0100 Message-Id: <20191216000418.24707-14-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 13/16] avformat/hlsenc: Fix check for presence of webvtt muxer 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index d738b08a3f..c612c3bbb8 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2819,7 +2819,7 @@ static int hls_init(AVFormatContext *s) if (vs->has_subtitle) { vs->vtt_oformat = av_guess_format("webvtt", NULL, NULL); - if (!vs->oformat) { + if (!vs->vtt_oformat) { ret = AVERROR_MUXER_NOT_FOUND; goto fail; }