From patchwork Thu May 31 22:23:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9186 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp161420jad; Thu, 31 May 2018 15:24:58 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJYE/XjkXkYfX/rjptS2sXIqbUfPcb8hBTE+0lEEs2VWrxcIdE7pcHXiyKvAQg8PMgBj2UC X-Received: by 2002:a1c:7204:: with SMTP id n4-v6mr957527wmc.138.1527805498074; Thu, 31 May 2018 15:24:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527805498; cv=none; d=google.com; s=arc-20160816; b=Moaf9NfbTmLUKi03oDfV/IwpjwKu1b//P26Fj2rVk/k027WJcbOuv2CuY15wUuq9UM IrjzNQqLthdKYvifCDIpN3bC/1mnjgEisp7+FLS5u98eNcjs6+i9ThAV5MJsdW1+6a+Y qpxwxNUwNzWmxEoj7WQxlKlMZ5gGq+17YpdOr5uR6SaSl+mOCKH8UPYVyrzoZvFulmHQ 14/zSNZGpKkWlM9yaeS49YhuSAOQxec8QicYixHxGaiVHuUOW1su5m/8845MKZKASfOm 9ybyS1GwdXP9LdR1Ggquw6mZrNi4UqSxvxyLy7ocMuVgy40c/oR+2IzhwKYgxSeGqSd4 KWag== 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=tepdjQKzd6RsZgWO8EighRLMmBRgHb5/J0QVd4XrqF0=; b=JiI8OTKwfBoiwLWJtPWsC8HhLj9P8aaTy3FpDgVI11YQRGHSiWTsPnkTKvji2Oj+ep 7n5Xy77d+iGhaf3bUYgHJuD4UqQokLBSwaAnPypJJppLzd7lTPuht/VoO92TXXHWN3io gnBGpBO/xG7Q4L8YFdOTTr1nXmN6BijL9EDs1k61Hs5tzbdzEGOUzxzoN2eCqR2qpU9s g0DCO39MYjkOXiMoohkv2b42EJl+9fwfxLujACPl59VLy4LwMrzqyqc5LF7fFlMmCUyY DNRIpoeuu+h0lETYZBaFyvBy4IzrxLXLKQZ60tpUHdkygWKeJkhuyDsX7n1n539eE+ar Wdsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=gBdi9J+h; 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 b79-v6si329357wmb.31.2018.05.31.15.24.57; Thu, 31 May 2018 15:24:58 -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=gBdi9J+h; 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 E9DEF68A484; Fri, 1 Jun 2018 01:23:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com [74.125.82.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DDB0F68A450 for ; Fri, 1 Jun 2018 01:23:43 +0300 (EEST) Received: by mail-wm0-f49.google.com with SMTP id r15-v6so28992504wmc.1 for ; Thu, 31 May 2018 15:24:29 -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=hc8Cpg8IdLA1gByZit0xT3e/sFlDDULWAYNWV0P03WM=; b=gBdi9J+hIgBgouWlm4SiCXmIq2mM2fOyTDTR1Y9lDaSlLkBJCbNIwDO+sqwwC7M1Au SJyUYYq3YRAvQSLX++Wu/y4AjJhTHFNV8GVl0Hmxgtev/AmZQuG/yk7QmfviYLjHBvUE vkcVXzps06DsunnV+Cmg5dUZlvGd6i5Il8mTS2kyg1XM4l4OezSyrSLM1o8bOD7GRWqj eQHsP6Aqc83cv9U8Yo/kDTBJuCwfRj5Gygu+J+n6ld6Vi4N6cHP6O6GXBK1+zcd7wxTC DsMaqzBeDWfWSXzDzePw02hy6Yk2Nkw8oupDO0gOU0LzVNwXlEeQwQlrIqG3HHfZqUvh tu1A== 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=hc8Cpg8IdLA1gByZit0xT3e/sFlDDULWAYNWV0P03WM=; b=A93RYJifqnfHKJKlivdd12HF01rvL+kTw9H0MK9gkitKJwALZBTH1UzZftymuCFM45 qOefELgxaSRT2+XstB38ECK8OR8ouTk2pKCGJ0+sfmQTzfOs5H8hD8p9NFY9JyQ6qLaW xl21LzRbCrX94zXZuRXmjgNYaZkwWuBAuXZSw++E6Fhn5r+6AK/CQDC7YttzzlPO5+By hjSSx1jU+wtP323biidp3s/ENv6BGgDEbEbDCadfaS0HnmiBv15e6Z/dVN8Yqd+acatO 65x6f+IevowkhQoJxnSp0ERzAR9CpcFwnJduqPSXbpKqtTG+v4efJ7DSw8pQFqKTkuJH dq4w== X-Gm-Message-State: APt69E1pnP6t1ivzoC5wai4ZS/nBHBX478kkV9LgpmhPbLaAQNOJPjyr NGYiqFBEqeODYkHoBspSAI7cFg== X-Received: by 2002:a1c:168c:: with SMTP id 134-v6mr992629wmw.53.1527805468462; Thu, 31 May 2018 15:24:28 -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.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 May 2018 15:24:27 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Jun 2018 00:23:56 +0200 Message-Id: <20180531222415.24966-4-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 03/22] ffserver.c: Fix indentation (replace tabs by spaces) and cosmetics 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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ffserver.c b/ffserver.c index 9b28fdc..fe84b2e 100644 --- a/ffserver.c +++ b/ffserver.c @@ -152,7 +152,7 @@ void *read_thread(void *arg) publisher_push_segment(info->pub, seg); av_log(NULL, AV_LOG_DEBUG, "New segment pushed.\n"); publish(info->pub); - av_log(NULL, AV_LOG_DEBUG, "Published new segment.\n"); + av_log(NULL, AV_LOG_DEBUG, "Published new segment.\n"); } segment_init(&seg, ifmt_ctx); seg->id = id++; @@ -337,8 +337,9 @@ void *accept_thread(void *arg) ifmt_ctx = NULL; for (i = 0; i < config->nb_streams; i++) { stream_name = info->pubs[i]->stream_name; - // skip leading '/' ---v - if(!strncmp(client->resource + 1, stream_name, strlen(stream_name))) { + // skip leading '/' ---v + if (client->resource && strlen(client->resource) + && !strncmp(client->resource + 1, stream_name, strlen(stream_name))) { pub = info->pubs[i]; ifmt_ctx = info->ifmt_ctxs[i]; break;