From patchwork Thu Jul 6 18:28:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 4237 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp2526662vsb; Thu, 6 Jul 2017 11:30:50 -0700 (PDT) X-Received: by 10.223.136.37 with SMTP id d34mr45677129wrd.160.1499365850479; Thu, 06 Jul 2017 11:30:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499365850; cv=none; d=google.com; s=arc-20160816; b=YrtFHk6sLZ8lyy6FjfQ7L47jDy0dkPk0LZ6hI6i7gJekXEBIEux8vw3B86d4QsTFQe svus/gGr63sO0d4hvkH0c0/X3ZigC/Kd1tgdVxZtPIX/IEqE2gBWl/pmiPXgYspSA30J PEQAMpwrfson1hX3U2xd51PDIsgtv4GuTNYgR6XjZJWmUygtaO7OwpvKX7YMQqxGZYTZ 2Fs/eRvyiIuvv1eMu6xpHuuAF63UJKbkISIgVaJwMLVlFdU0tIMxg/Wy9z+6Ywx7sEhz 0oI76a7nATc3LKqw4enz5CZrbmHZ6KcPaSnqr1Uk8mfOJe0DiJj2f9STK6nQSdUdphRt KmzQ== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=BJC9DUqcrRcPLhHQKroOWtgBToNAA06+BvWI9ffpn8w=; b=pbNreO1RKgGXIcGSHCUPLwSBsSpt67HheXHv5jSf17teI5AjT6Hj9zNWocxJ+3ek7f zs+L7fZllk/Sej2Y3zaQHiI1idKzCsBPx8D4HJHTLmq+1gOSYSjq1Sq5JdhX+tSwKytM coqdZJEh8W+n9EApZtD1hPKckNYqaF9D5gWKGU43762MJYlCvBjHKpkbuKbxS5ZzWfaE mVW/z6PhCk1fnTVwOrxzSxmNITHG1LpZ7D0KQ52AE8v1gHKRp+aTCK6zy/CnRADEfo62 dFBMrArReZ6AS+BjgS/kcZms8HTVblcU6dTIu+eDzD5ZvZUBZ5QX3DKx9Pm1vMBrsdGO RwKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=H7NLhQ5s; 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=NONE 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 s75si894103wma.14.2017.07.06.11.30.50; Thu, 06 Jul 2017 11:30:50 -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.b=H7NLhQ5s; 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=NONE 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 C0FDF689988; Thu, 6 Jul 2017 21:29:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 39F90689950 for ; Thu, 6 Jul 2017 21:29:38 +0300 (EEST) Received: by mail-lf0-f65.google.com with SMTP id z78so1483363lff.2 for ; Thu, 06 Jul 2017 11:29:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=8NfmHvM9eqLppzFkemRT4vyG1jnB16gRBLKUmJ03lvE=; b=H7NLhQ5sqD5f/CYLZjCUfTbiqQu54Mc7yJXEA1bvABNURrP3PG5YtxmMwyAeBdKw9Y cOGMasc9TPK9rtps00zS4HouCsBTUdyHuTHxzFF2nxm8LwMwgR1fcyc1YQ3YV42qDOqE khUpR5riDfFvZWSOSmZLad50tO1AZlSYUAwWOd613B8Uv0rzn9oMKgQ6H5u0Lz4l60HE N0Q7q0PRcngS+qKGS5DbxF5UHKX5HxZJC9AMmTT7rZUtibEhzcLWb92cvgTIRtDhaCys hH2YSu2qb12ndK5G9slYlh5ayRUrk8CXoq+2h3DA2F5lus6/sJuRZmG6cd4BqHumC3SZ Vvqw== 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:in-reply-to :references; bh=8NfmHvM9eqLppzFkemRT4vyG1jnB16gRBLKUmJ03lvE=; b=A95R2Drw4gFs+FetD7i5YkajAHoiLVfMv4WracYnemyXuccH6BsJ5zMS+kp1vt+3h1 WMwVryTO/Xg95C4VLK2oK4LhMZf98yN5CcAUjBbVoSPSSTzefFb0C1iunqAyGBEFnPPa KZ4GJyUbzqnPfvrk7QJvQ1gtJSAqv5crSFokdmcqosrpb3RLeNsEQYr+Ff3DgzHXmDRo Gu9blzWqqK5wdZ1nkXcNUgXt7821jX+Sa6nBsduqQYvAktkwtDXv7daHu7O4mVSaCqqz 7B5OIoqMZFjorGbC2y5QZA1yQPOdqBEz3pxTWYwHnc4+TlBK8zn1l1i4kjiXleNjiHAB ZIKw== X-Gm-Message-State: AIVw113LJj2BaQDeBJLozS4LglXX6X5EOMY9YRpAENlNiQ1ugd4CPzCw UkswSRWrLeNqucOhfZ8= X-Received: by 10.80.151.71 with SMTP id d7mr318352edb.163.1499365780345; Thu, 06 Jul 2017 11:29:40 -0700 (PDT) Received: from localhost.localdomain ([62.208.38.79]) by smtp.gmail.com with ESMTPSA id k49sm1371108eda.45.2017.07.06.11.29.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Jul 2017 11:29:39 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jul 2017 19:28:38 +0100 Message-Id: <20170706182842.7785-9-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170706182842.7785-1-derek.buitenhuis@gmail.com> References: <20170706182842.7785-1-derek.buitenhuis@gmail.com> Subject: [FFmpeg-devel] [PATCH 08/12] hlsenc: Add missing error check 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Derek Buitenhuis --- libavformat/hlsenc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index dd6a62b13c..b3b52da369 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -602,6 +602,8 @@ static int hls_mux_init(AVFormatContext *s) av_dict_set(&options, "fflags", "-autobsf", 0); av_dict_set(&options, "movflags", "frag_custom+dash+delay_moov", 0); ret = avformat_init_output(oc, &options); + if (ret < 0) + return ret; if (av_dict_count(options)) { av_log(s, AV_LOG_ERROR, "Some of the provided format options in '%s' are not recognized\n", hls->format_options_str); av_dict_free(&options);