From patchwork Thu Dec 26 10:53:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16966 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 5F373449EFF for ; Thu, 26 Dec 2019 12:54:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 481D968AAF0; Thu, 26 Dec 2019 12:54:15 +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 5CAE468AABF for ; Thu, 26 Dec 2019 12:54:07 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id d73so5652099wmd.1 for ; Thu, 26 Dec 2019 02:54:07 -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=V1p6eOt1s8ScWjZLoYH1KIiFNZX4PRbGfNcCRSLU/bY=; b=U4Cxnhtck/aMu3Gtouv3TC96UIokMaEckrP02EwxUJxDVXDWhVqlLhloqcGoOO84tZ R0WLiacFh4hDv25ZaacKJq2cf9701o4Mrt/q4LvZe8SB7pBbQEoNt7RjdefJ+tAgfpsA lT+IxcAigAsuT4HGjcdy+5kiCAZEn45vfRDPScrY6QXgl0weshw6iHXzNVl6zYVZR+sP SGroJcoyuOuwFI56/sUzclMOruxH0ECBVw3eLAkVb5ZI6z8buARd6rCL0vcmiz24OyH8 Me86l7Um0uSIDP/7b0+1h782yxfGM9uIszPsoqdMbh07Mvu538+vAV0x7oaBv8TkzvPz Dbcg== 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=V1p6eOt1s8ScWjZLoYH1KIiFNZX4PRbGfNcCRSLU/bY=; b=qCSRItBeAlr/5gMS8xAi0UyJWnEKUShz6hn/NSnWUWUarJikYRaaXAaP7HZKoZ1bF7 NTkUiARfOVmXS6ut3CXk0leHp12xpzTPlCLnAo5JIRsgM91AULeDBUrI+ue9KvF1HowU q8fkXiNdpGBeOzZp4GgEvmvPxFIIjJTzlLXMMhRcNWB4eGmg+FV6zqwvj6EYoineOMvU QRHHGiWHnJ9lQZFXa3MmzGG8PsCwM7jXVqpaBRQ30eH0ksAcTlI07C/BPAJ4r4KZQud8 3r08Gtb4wFDe19OfZvxvlAJXvRpmIeAZ7rYzO7zNvRhc1ofZqBkqCpi0Cnvh+x1rgeCy kUfA== X-Gm-Message-State: APjAAAVlcERFXZEr8Rt4yOPI146sCh/O4acNg2Qk3KQN5dLAo/RAVQ/6 56vNVj6UFT2+vzB1+PKLSwFWT7YU X-Google-Smtp-Source: APXvYqx3/Nu1iSorwRB5rPamtugfCwZ+AWAsQN2TRE+Y8PfzLiJgTiGqBSbIUec6l0zEy9UcJibbmQ== X-Received: by 2002:a7b:c775:: with SMTP id x21mr13596535wmk.59.1577357646494; Thu, 26 Dec 2019 02:54:06 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc10203.dynamic.kabel-deutschland.de. [188.193.2.3]) by smtp.gmail.com with ESMTPSA id c68sm7997618wme.13.2019.12.26.02.54.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Dec 2019 02:54:05 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Dec 2019 11:53:29 +0100 Message-Id: <20191226105342.11175-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191226105342.11175-1-andreas.rheinhardt@gmail.com> References: <20191226105342.11175-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/17] avformat/smoothstreaming: Forward errors from copying white/blacklists 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/smoothstreamingenc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c index 0e4f531f90..a5fd8a18db 100644 --- a/libavformat/smoothstreamingenc.c +++ b/libavformat/smoothstreamingenc.c @@ -333,10 +333,12 @@ static int ism_write_header(AVFormatContext *s) } os->ctx = ctx = avformat_alloc_context(); - if (!ctx || ff_copy_whiteblacklists(ctx, s) < 0) { + if (!ctx) { ret = AVERROR(ENOMEM); goto fail; } + if ((ret = ff_copy_whiteblacklists(ctx, s)) < 0) + goto fail; ctx->oformat = oformat; ctx->interrupt_callback = s->interrupt_callback;