From patchwork Wed Aug 1 23:00:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9861 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1384836jad; Wed, 1 Aug 2018 16:06:43 -0700 (PDT) X-Google-Smtp-Source: AAOMgpebqgVG3cvA98tgjC2MMKaPqURMUB1DfuNr0wlhoEfkfhEALCWmALzCmiuP+SSf6koomvIp X-Received: by 2002:a1c:98a:: with SMTP id 132-v6mr228700wmj.86.1533164803708; Wed, 01 Aug 2018 16:06:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533164803; cv=none; d=google.com; s=arc-20160816; b=IaO+33wTGJ1h0ZtPrtrSeS7J6DQ82CE6Ja+fJm/7UEQatcWqw1KpUJMDc1FMweai2Y qCRZmC+65exFH0UG0GE2D/eg/zkn2L8WfuDREjNmA25N/uOoDEADxQINBrYytEVndt/2 xiTXZqsL9UnJ0WfhfQULQqH3JGvT1Q6rDY6xtOQqttHR+kZqxrgccscMXcuSAGXYha+8 JazPRgAw5GrGzCpNspiQRoQwVbHlOEUvjeD7/RZQo6bPpGlMSoV+oubeFLK+xMvGKmxp 3EQnDk3bmA2T4/LwXA9xVaoEybSGOumz7mQ3wmmIyAASY5SROfUkrEaH3+Uw/mgVa23T Ipjg== 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=+Qgp2h3Pzx+gSrqtZgrcRfDbgXXjh+UZkWuSo7Q2g5Q=; b=bxRdfR83ZWPbTwpaH+BFIBxKkvsHSKrdgv7S30GKKF5lXKwNtVWpw4y4zSqp+oRIAS cP/ObF7pRie+fD09ZgSZtvhr8jtK1tpfq4dkMcLKn6isk1/yb+k3imoSaE1N6WC/3aZ8 2tzPqT89aQFGQAvmHikfVVH+H/8Eh3t7huy0emkksNxzc+3+T1vOj+CGKiPT7TBzWyQm 0wQk758ObkPZJDq1y/fi99/X5HWVsHbkTZQDucB0LQ0xE2hjVORE6DKxruReW1HgDpT6 qoAC+org5xrQU/g2yQv1fKrdn7uCVqMoyAOsSF5ZHGkOeSG+THkrQ6RaA5x5bD9Lyyw3 UrqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=rHBbLP9N; 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 o4-v6si142945wrv.427.2018.08.01.16.06.43; Wed, 01 Aug 2018 16:06:43 -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=rHBbLP9N; 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 5C14768A575; Thu, 2 Aug 2018 02:06:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6EDA268A476 for ; Thu, 2 Aug 2018 02:06:23 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id c13-v6so251867wrt.1 for ; Wed, 01 Aug 2018 16:06:41 -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=MVlo3UJH5242mxiKW+b0N69ZqHe9idodlCb+nStjVMY=; b=rHBbLP9NRXZzRjMkuyV9VWh4hxoeOPDm/2A25vXpVYoCqUaZz8uQNYclLzFhMgS6aT FqKq6j5aJrdX4o6iaK5wRfpW9AMqlUh6Cb45/5EGkSAS2jI10g4XqHdvoe9M410KoDRt vC9i3zv2hcAOMGFCJLGmCMjUc8QeDsWyD+rUlSJrz1ICELorGS0lciRp1waG1s5VAC9A 6XjNm0kdEKv3PiIUDAAYgfR4KEx3iHPdVzG9xtU8zSjuFDbm8UH+U0GYS9sK24qKaU5m hZwVqr6ctO+x7SNd9naKM7XLaQHhSswtV+zDicoCFcJne1AwaNR6u8/ogYoE+7Hg+Y/i Szbw== 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=MVlo3UJH5242mxiKW+b0N69ZqHe9idodlCb+nStjVMY=; b=GNwtaTK1jUPKYelcogPUkTF4T1J5bMmNSwRt6lEPsmdCq539JHx4M/thk0PoSMi4zo BmL34OoERWgC58r7dd3XoA2GqNcUL+dQUNMKewP7NeqnLwjw+xf1IyACe8O1x9yF2mJV FQViu+vLj2NRj69GOpgbN/3T9gLdbFdK5/sveKVVVXld3kl8FQ2iC2+k5y6CQLjF3Cz0 fQtGNjnijjZnZABKwRHAaIAHdprpEQqkxH+YpXekSBDO2bPGYgJs/akayBrzuP+e758M 4e0/fT1wvPVR06rGoGTY2oavokH3ZFRC6zJIr33i+mI2VgmaqDfnJbXSLQKgIGvY3mSn J4/g== X-Gm-Message-State: AOUpUlFkIorvpgehNW+cA3LtrF2WHTTRLm6OHZ/8CLGlTQln4exFB2Vl +9T26xEkMJYtqVfPjbgIcwr+wwLi X-Received: by 2002:adf:b3d7:: with SMTP id x23-v6mr164038wrd.253.1533164430678; Wed, 01 Aug 2018 16:00:30 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id e133-v6sm101201wma.33.2018.08.01.16.00.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 16:00:29 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Aug 2018 01:00:18 +0200 Message-Id: <1533164424-12395-2-git-send-email-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1533164424-12395-1-git-send-email-klaxa1337@googlemail.com> References: <1533164424-12395-1-git-send-email-klaxa1337@googlemail.com> Subject: [FFmpeg-devel] [PATCH 1/7] fileserver.c/.h: Fix fileserver_schedule() 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 --- fileserver.c | 1 - fileserver.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/fileserver.c b/fileserver.c index a3460e3..d2f8c7f 100644 --- a/fileserver.c +++ b/fileserver.c @@ -49,7 +49,6 @@ void fileserver_schedule(struct FileserverContext *fs, struct FFServerInfo *ffin fsc->buf = NULL; fsc->size = 0; } - fsc->ofmt_ctx = ofmt_ctx; pthread_mutex_unlock(&fsc->client_lock); } else { av_log(NULL, AV_LOG_WARNING, "Could not find free client slot.\n"); diff --git a/fileserver.h b/fileserver.h index 6e449c0..bb4893c 100644 --- a/fileserver.h +++ b/fileserver.h @@ -45,7 +45,7 @@ struct FileserverContext { * @param ffinfo pointer to an FFServerInfo struct containing information for serving the file * @param filename filename of the file to serve */ -void fileserver_schedule(struct FileserverContext *fs, struct FFServerInfo *ffinfo, AVIOContext *ofmt_ctx, const char *filename); +void fileserver_schedule(struct FileserverContext *fs, struct FFServerInfo *ffinfo, const char *filename); /** * Initialize a Fileservercontext