From patchwork Thu Jun 28 00:51:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9531 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1478959jad; Wed, 27 Jun 2018 17:51:55 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfWo2n4RRIo7PsvHD3ogLcrAOIstIPAVNeJd4dPNiTDkbDgZUeXCX4f+bp9jA8sdugG40ze X-Received: by 2002:adf:f811:: with SMTP id s17-v6mr6524877wrp.172.1530147115193; Wed, 27 Jun 2018 17:51:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530147115; cv=none; d=google.com; s=arc-20160816; b=ABFe5Ma4GHCnZYBm9DW9vk/tWKedKuLtm/rDOCQkK+S+rMWTUNzTIsl9oR8XsaxA7Q 27ru+hJUbmJ8SxXmRsx/LpnydaOXKWvoF+XehIhULObKsY+odGpWKR5jwCaR6TiwAYpy tkqJWb3/ccbLH6QqXBz/jyxzsNoF+LdhWteQjvRfsOXER+P/XGJ2vhJv55fGpYCjLfBK EkdReCbAkM8WAMubTQkWat4GfReWutcNOLT1jmRPJF3+SASqjfrgoMdb+J5sEyNy/D3g OZBwszCo7CRAQWJptkjgF5Ci2sdU+zr3Rt8PWI55MFYToqznsdsEsF/5CT7kbpK/8qHv g+8Q== 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=ekzxHpXVRS+M16BY+HyeQCv3JaLrQIhiSRawpZteWjI=; b=zjTZmpBnIzbVuVEYLCu7SNYPTNldf65XaSKcqlwWwpSfhYl9TE9b6okkvoo5+vgC7+ YPRZVmWuvO954i4DdqzcZ2hSmEeSoIiPd6bjhGUaoXJPtFZntcFNa/LntrEixf7LBfoT p3qNtUwQCC376US0P//bk6ugVLG6YNu2vZV3z5yNqM6GvirOqOJv/4UvN+4/1fTH3h2G EIstt9lHfuKFkg0WF32RlIO+EDfP5dSXFij9T5IH0pEvsA6Kc1+qMBnz2w1h8Bdc+kC0 muhPxiSku4SeBhBG94xpdLQ2F9mFRjDH1+vQMMB/6bJcWsBcmjETHFfRHy52xI6eMqG/ QknA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=Y4bta0mz; 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 202-v6si3122083wml.114.2018.06.27.17.51.54; Wed, 27 Jun 2018 17:51:55 -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=Y4bta0mz; 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 21E1768A401; Thu, 28 Jun 2018 03:51:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1651768A20D for ; Thu, 28 Jun 2018 03:51:29 +0300 (EEST) Received: by mail-wr0-f196.google.com with SMTP id p1-v6so3709160wrs.9 for ; Wed, 27 Jun 2018 17:51:30 -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=KQCGyS8gc9op3lf1mvXBAcs0wvp3k53hANx2PFYMMAg=; b=Y4bta0mzH3yNktVLLnCZWRKi8YJZ10xhPgRjebUPTvYPDrVQ4+eQ+7afJ8pK6MjElk a3IiwFC9EAOWrFnJ9tEeiEYeyVQ+PFEW7hDuuhDdZsBKmcM+oEDG7x9lUm9W4iovbOP3 DE54cQ1D2GSssNTAtCRJOPLOudrJzHU2vrIjKJYxp5BMjCSXkrmLKer0c04Iey7F+BQc gyeBMCdDOnUvGglDY0AQdggFUjiPDlToPPW/c9I+d0occhPnE/8x3WFkYWXr9Iba0CzC bM6tC0/esA1aV9a5CHc2AFFviK+LCBC/W0Tix6bF4i19m7MZl2Y32OXLTf/Iryja8XQ4 Ch3Q== 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=KQCGyS8gc9op3lf1mvXBAcs0wvp3k53hANx2PFYMMAg=; b=DSCPpDxPQED7yrZ7wxR1I0JP4cp+rLCUntW6TvtJI+0HrwXswsZwg6IBiXHOHTUtLC fGaRBQj8h9Gb4zbR17e4isLrMpSuGlyrhfO2VgqZXvTXnnF4D8BbDleQJnXZbygxMD5S VbX98bDPAw2yMz8Hujg7ErKf7fDlhIoD6CmSGlIvYaF+vLvnhbaFBVaEC8zCKppmwzow 5gxBGdhfzyeY8JZBj5UQF9A1waYPTJC5+sjIQmIpZzsHhG9FV+wK5tDOA0yrvkf1NKrt SM1jmAYyOzL3WVwbKPvPWQr8L2wTqjbFUI+uSl6ZzWwh7SJaTh9Rt5L9hqFau8ZZgJAV 2ZXA== X-Gm-Message-State: APt69E0sbulXN+6NuQOwfv4XVqoMrMdNQMQD9l5iuewVkEREimrXQjzu KGp6aEjlHtkt3ic9NlWG83dfMA== X-Received: by 2002:adf:dc52:: with SMTP id m18-v6mr7137121wrj.84.1530147089493; Wed, 27 Jun 2018 17:51:29 -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.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Jun 2018 17:51:28 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Jun 2018 02:51:03 +0200 Message-Id: <20180628005117.18902-4-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 03/17] lavfhttpd.c: Remove trailing whitespaces 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 --- lavfhttpd.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lavfhttpd.c b/lavfhttpd.c index bc856af..3f29ec4 100644 --- a/lavfhttpd.c +++ b/lavfhttpd.c @@ -15,7 +15,7 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - + #ifndef LAVFHTTPD_H #define LAVFHTTPD_H @@ -29,30 +29,30 @@ int lavfhttpd_init(void **server, struct HTTPDConfig config) int ret; AVDictionary *opts = NULL; AVIOContext *server_ctx = NULL; - + snprintf(out_uri, 1024, "http://%s:%d", config.bind_address, config.port); - + avformat_network_init(); - + if ((ret = av_dict_set(&opts, "listen", "2", 0)) < 0) { av_log(opts, AV_LOG_ERROR, "Failed to set listen mode for server: %s\n", av_err2str(ret)); av_free(opts); return -1; } - + if ((ret = av_dict_set_int(&opts, "listen_timeout", config.accept_timeout, 0)) < 0) { av_log(opts, AV_LOG_ERROR, "Failed to set listen_timeout for server: %s\n", av_err2str(ret)); av_free(opts); return -1; } - + if ((ret = avio_open2(&server_ctx, out_uri, AVIO_FLAG_WRITE, NULL, &opts)) < 0) { av_log(server, AV_LOG_ERROR, "Failed to open server: %s\n", av_err2str(ret)); av_free(opts); return -1; } av_free(opts); - + *server = server_ctx; return 0; } @@ -106,11 +106,11 @@ int lavfhttpd_accept(void *server, struct HTTPClient **client, int reply_code) ret2 = HTTPD_CLIENT_ERROR; reply_code2 = 400; } - + if ((ret = av_opt_set_int(client_ctx, "reply_code", reply_code2, AV_OPT_SEARCH_CHILDREN)) < 0) { av_log(client_ctx, AV_LOG_WARNING, "Failed to set reply_code: %s.\n", av_err2str(ret)); } - + *client = client_http; return ret2; }