From patchwork Thu Jun 28 00:51:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9539 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1479359jad; Wed, 27 Jun 2018 17:52:30 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe+H1E3zPCYTaBLvrfcV2k0EEvi+xIc3y5VAmWJLUcTBxgAEN+p9GTcA/1aTrC1lwcO6Bmc X-Received: by 2002:a1c:3a91:: with SMTP id h139-v6mr6680458wma.94.1530147150722; Wed, 27 Jun 2018 17:52:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530147150; cv=none; d=google.com; s=arc-20160816; b=tGODqy3CdULPckPgvbDStnELKrBvQsl0WNJ2X54w+PudHQbp3X1XN75PC0yX5QjaQ4 eBfaBVgOnfb/zjtbYqlAqcilYe79cvGVZJUIlUoiFEFNLceHEUaHrMvbmr3Q/erkGtsk a+5fKgkfV6ZAXRw1X7fklixlTu9PL+qaNugiYH1kpaenFMR/PddKe/nYiaudWA/mvVn4 mvIt8hBXCIYhvXuQTsRMvFy5sUJN93VmGYuH5WYxKaU9btMD5enMwT52pHXEfiTMD5zF pBK1gQsaLYuhXBxdE6VUevEDUqXBM7Y/iasU69lZU3vcuOsCLEsMtRrpMMsbCHlYIAzd CXPw== 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:cc: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=hl6RK0xYxId993gTpIu/To1HLhtWVWT70qc5kgEaXao=; b=sNlt/kZW/5Y4Xu/fgfFOLlAqYb/uVicXzmnRvsSLVeL/yeZ64pPAFpPLqQPPgJtGX4 aTBCzBc8TSAq0L0hXfzvKXZsWKncjWvvBkqqq9XPJIvqxlH57fkMK1Giacvoy19MH4r8 Q/bnbRlXhMyuG9e6Uenn2pIgr/ggXOdgfkKYpyUO11pV4Q/XkdAZ94gHrxDflgq2RHbe GnruzFwbFnLwv/rzeiRD5gOT5vZQAqC4otrO7QLx2w/necfi7S9Tw5k1dRFafvWPBKSp fCR4Uls571kX+m30bXbowuE9PolePXXjqk/2U5XGcGRjlqPp3qggp2ytiHE2GKDYfbwC xSEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=jAOwbykU; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t81-v6si4131637wmf.30.2018.06.27.17.52.30; Wed, 27 Jun 2018 17:52:30 -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=@googlemail.com header.s=20161025 header.b=jAOwbykU; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4400A68A568; Thu, 28 Jun 2018 03:51:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f179.google.com (mail-wr0-f179.google.com [209.85.128.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71A2C68A35F for ; Thu, 28 Jun 2018 03:51:36 +0300 (EEST) Received: by mail-wr0-f179.google.com with SMTP id p12-v6so3698948wrn.11 for ; Wed, 27 Jun 2018 17:51:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8sPEUKuQ0B0DJ2CGCi6n3IBRLmpalOo0qc9IXR0uWSg=; b=jAOwbykUyMoN+OvxfurbwYtGLNsjjHGcuxNqQ42wMrR50qnkKesNIXIgUjnbh0S2CZ swsQrWfQ/9kGrLSaAFDiNBAMv26/DnM4kjE7nRh2nyvtwhnHdi6t4HS4E/L+6ufOEvE3 34r26bCM7uvHjYzwq/7sRs4BO84g7N0W434XSU+TBRajdp7/402UsgldzhPpptOpsMp8 I4ku4SPbant8+E63o//ze5R2mCx/wh67Ms1c8eVe2DEUUc4xVKITOkZ+ai9gW3H9qgi0 Vb6OwLaziuCYifYry8VfYniSLx79Da9P/dY/pg88Nw3F5yiZ9oPAGeR4rdEPqM2v8WZ1 ZwDw== 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; bh=8sPEUKuQ0B0DJ2CGCi6n3IBRLmpalOo0qc9IXR0uWSg=; b=n2if+QjfOEAdoYs0R4aD2gRzrGr/5H9cjWEgehqv5WhV9OzyKDl3PqnV6Wc2Dz0ZRo 53yTtZXwWaToUisE+xNwELDrTLLGaOSbn8fgNuRa7pSKVpzJVihaxcd/tQjdFuAiT2R7 XMC0iDskLdAwJ84dP9lrTr09hsLdpMPUnA6di1vmjr6Fhult4p/jKWWuhOg4xuo8DO7V KpnMPT6Y0EgqRPnkFJtPlf9V511X5BNO0sZdxG3oX1vZJrQqHnmj3W2q5PFY+TGUYNqy ydbi93eJzBuJ39SSJrUH3yrG/6j8946jzADPSbkcVUk5rz0s80TCYieyBsMidvcqmAix PNhw== X-Gm-Message-State: APt69E2f6hU5sbZMJ/hqW4KR3CCJITax01U3Sh/lvuXpffLjiDN3IBg9 PDQxsC7oyoQ98OMQXQdlrFpTMw== X-Received: by 2002:adf:e40f:: with SMTP id g15-v6mr5389613wrm.145.1530147096994; Wed, 27 Jun 2018 17:51:36 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id a9-v6sm1363017wrq.1.2018.06.27.17.51.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Jun 2018 17:51:36 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Jun 2018 02:51:09 +0200 Message-Id: <20180628005117.18902-10-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180628005117.18902-1-klaxa1337@googlemail.com> References: <20180628005117.18902-1-klaxa1337@googlemail.com> Subject: [FFmpeg-devel] [PATCH 09/17] ffserver.c: simplify cleanup in run_server() 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: Stephan Holljes MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Stephan Holljes --- ffserver.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/ffserver.c b/ffserver.c index cc7dc6c..f128b55 100644 --- a/ffserver.c +++ b/ffserver.c @@ -646,18 +646,10 @@ end: } av_free(winfos_p[stream_index]); av_free(w_threads_p[stream_index]); - // pubs[stream_index] could be null if the file could not be opened + // pubs[stream_index] could be null if the file could not be opened or mkv was not requested if (pubs[stream_index]) publisher_free(pubs[stream_index]); } - av_free(rinfos); - av_free(winfos_p); - av_free(r_threads); - av_free(w_threads_p); - av_free(pubs); - av_free(ifmt_ctxs); - - return NULL; error_cleanup: av_free(rinfos);