From patchwork Thu May 31 22:24:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9200 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp162227jad; Thu, 31 May 2018 15:26:11 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJHSKn6+MG4BdELPuSwmMVmVMhg9V4DnGqZmez6qmUJftlh9olhXDJBdLT9W+juWhyn8p4a X-Received: by 2002:a1c:b954:: with SMTP id j81-v6mr942687wmf.89.1527805571788; Thu, 31 May 2018 15:26:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527805571; cv=none; d=google.com; s=arc-20160816; b=ibzTBau1e+j4/DSqld11DSm5bmyhxGPo5LzJLNwhJ/D3lw5dWjD+KAvJ+YF2iTMmnT M+b5ZPo5WxVN2/eZTLSp3GmKZluW/bT4gp0gu+IfaQt5YctpX7zEseEWe2KFiPuZFxLp XFG/EimK5dIyCgHPKJwoEXHAn4sIel/Sq/gUmmCOVdYEbSSRcvVwrdqHvr+amy0025zT HYLENqITuGHqbz33qXKN3Kph31gma4IRZJ00lGEeywGYlbw2qIGrzJwYF9tDKoojN8Bu csd4Niz4STArS2zT7dL9vH/k+9Z2vE3GLxLfOrPBOkmhCxOacDTYuOiqBhGJngMSrSpL gSqQ== 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=eB1zZRfJzCpf0aPFYBu8Mb8nY+1m6JEwHYo81NtCtMI=; b=Pb7PoA1wmvTkvJHj8clYXQZYiooH//Qekn6NXkSo1liFUl187HGrg0MyA+J0HIhAXc O4DtSDkB5L+chlXyDIlhVeCM9H2qv2F5opYLY/X8M3d6vwvukwqXapyCs4D58LjEwvBy 781sTVtcUvLxNQ0adN/iLojyZkxEtHN+IEGz46TrVeD7RLsOaFWEC8RiHuDNKSEgt/Ud H6T2de2f0BEA5uRbGz0TpyWawiI2dX1YPPajrG6u5VSNAyzR9jRtHHid93MrjC7X/yDP F4jEeAfYfVEOCvRYyQfOIIMSG45UgU6XjqD9a5mow4lv+n1aLkS7CX/p737zoPoA7h8e yf0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=MSr3nHg1; 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 v91-v6si19853885wrb.261.2018.05.31.15.26.11; Thu, 31 May 2018 15:26:11 -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=MSr3nHg1; 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 75FB468A4D5; Fri, 1 Jun 2018 01:23:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EC64F68A471 for ; Fri, 1 Jun 2018 01:23:55 +0300 (EEST) Received: by mail-wm0-f50.google.com with SMTP id j15-v6so5140178wme.0 for ; Thu, 31 May 2018 15:24: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=jjxIFdZ93Yf05M/2c7Euxc8ud8odoMnswKvySMknn+s=; b=MSr3nHg1fUt9EBNl7qrOKTYt4/tDpcQ+k1wFluZCxyjZnokXSRYrbHjSKjhHm9zUMl BOri2v2pmyLezAtAPLBCx/uoclXU0xMQzNLYZlwMOVbRJMp06zHnA4kFrZ15gQowPmpS CQxTxaAdFga3v3PdXEgZpjlX4MZLIAsq++VdewAQZ0A+mSwonEMzFERr2Nr8y+v3600E lrlSeO/dzNmPwRBBVR/GYCB0888hVl97vCAWEe2LsC+Oc3ihd17838MQRNpq2PaoRJO2 bR9yyM/6yEYZ2Y8CffWPF8F/meowF1hPh2r8bKFtDjk/Vqy3Ppl8KTktVSKTvciClWg1 g+Bw== 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=jjxIFdZ93Yf05M/2c7Euxc8ud8odoMnswKvySMknn+s=; b=hh7Nie+ixA+nqIrR0HEbO8zY0Y0Q2AOdDqfeSoJcDPIP4l7QhsrowpCuylKrlBMRpg MGqgYLAitIkMVdxtK9qzIGfxCPDwUWHItRPnjf4MBlbGh2DZHEkvor/y2L+UK9eQbRLU FdPXadp5rqG9h6JS79o41XJ4SzA+2GndYjbgKHoYbzyXd6CNgPvhBu4yREmv2aBftHoh oXuzZ8MfOSr7X83NHXQI6E3PFgjCTXhmhRFOxl3XAYqMdycqQsobhYh86HX0p1vjsGSh e9qgZ0b4yEn7h88ZzwGJCGgK/k0lLlGthf6etv3WEiwdDGz1IpLit5wtRpmKEvQSJ3mI 9L+g== X-Gm-Message-State: APt69E3Vb8XC0VQYCi58WFeb/G4dntYbQvIz4f/TSsiufv0TZNZhOU8I nXWaeOMlV7YOlD8bxYBsX6hpCA== X-Received: by 2002:a1c:b20d:: with SMTP id b13-v6mr1000785wmf.130.1527805480402; Thu, 31 May 2018 15:24:40 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id b72-v6sm705017wmf.11.2018.05.31.15.24.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 May 2018 15:24:39 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Jun 2018 00:24:05 +0200 Message-Id: <20180531222415.24966-13-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180531222415.24966-1-klaxa1337@googlemail.com> References: <20180528182711.3221-1-klaxa1337@googlemail.com> <20180531222415.24966-1-klaxa1337@googlemail.com> Subject: [FFmpeg-devel] [PATCH 12/22] ffserver.c: Replace sizeof(struct ...) with sizeof(var) where useful. 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ffserver.c b/ffserver.c index 50d61e5..c6e8516 100644 --- a/ffserver.c +++ b/ffserver.c @@ -210,7 +210,7 @@ void write_segment(struct Client *c) struct SegmentReadInfo info; unsigned char *avio_buffer; - av_fifo_generic_peek(c->buffer, &seg, sizeof(struct Segment*), NULL); + av_fifo_generic_peek(c->buffer, &seg, sizeof(seg), NULL); pthread_mutex_unlock(&c->buffer_lock); c->current_segment_id = seg->id; info.buf = seg->buf; @@ -288,7 +288,7 @@ void write_segment(struct Client *c) avformat_close_input(&fmt_ctx); avio_context_free(&avio_ctx); pthread_mutex_lock(&c->buffer_lock); - av_fifo_drain(c->buffer, sizeof(struct Segment*)); + av_fifo_drain(c->buffer, sizeof(seg)); pthread_mutex_unlock(&c->buffer_lock); segment_unref(seg); client_set_state(c, WRITABLE); @@ -385,7 +385,7 @@ void *accept_thread(void *arg) info->httpd->close(server, client); continue; } - ffinfo = av_malloc(sizeof(struct FFServerInfo)); + ffinfo = av_malloc(sizeof(*ffinfo)); if (!ffinfo) { av_log(NULL, AV_LOG_ERROR, "Could not allocate FFServerInfo struct.\n"); publisher_cancel_reserve(pub);