From patchwork Thu Jun 28 00:51:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9537 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1479543jad; Wed, 27 Jun 2018 17:52:47 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdaFImVjs1Y17608ZQLRKWElj7Z5RYGN9EzXNSLLrSx5UU+Mt+/o1wYVfyoqBdr7AtWBFQs X-Received: by 2002:adf:ac66:: with SMTP id v93-v6mr6699879wrc.7.1530147167578; Wed, 27 Jun 2018 17:52:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530147167; cv=none; d=google.com; s=arc-20160816; b=QPBJc73Kymj49q5z9ZQZGBkKlI3M9fNbs+CM9ZvlHBsTiYv6wBb/NszeciFfH6f1NM 9CvbE8dFfzcLaQoxqgcSnnTU+lYw5LyrmvCrPgy3qYh/ygKW/luY6eIV5WimaZqWrCQ6 mVd3FtMvOO2t/jDqV3L7QZPRZly/J/quOGGA0cEAwOq/nvG8AlWNLRIpZuJKpuq87cwj bvh39oOP30CQfVV5a2MqyWzl7Q+rOWf9LGsQTEavu2qpZ0kOvLUxdUVL7D4DE4WP0Qmy LOl6CjedvL4xdsbHujNKTfWNc01nu6QFSTUbPgWlcV6sJ+a2LYYq+Hhga76bLcB66BeA g4dw== 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=psVJkXCQ7XNQ/SM5vth+ccBa01WPAVISUITCz1cQK5o=; b=x23c8ovLwl62vByQDGlTD9g2NbCRX3IGLrVBJzj2hOOeokNVlfMaZAEX1Ll1ZQdLaR KEyP8taVCVUXCTscacHMzrGf7M9d4ztp7WDI22h6+W6M1oq30gnpL58K2gT5cZ+/UqQ5 hwCernQL11rWOA5OQT2j/geuV6sbRWh4kN1d6I/QgXvLyt5pb+4uYNSZjtM9HO6gIsLo Ix2NJz19woErD2H2YOHkb0LiSBRZqvLtBgKNZEDbAhI4Vv4oAtu4/Fua5ak6OiVgIWpk ggJoPQJvRdn46Pj5qCobaQW7ai/vCU6crW5p/nkZZ7XfQz/UpKRj2WECQVz1xOSYnZR9 iObQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=Yg+0apyf; 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 s14-v6si5136493wrn.143.2018.06.27.17.52.47; Wed, 27 Jun 2018 17:52:47 -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=Yg+0apyf; 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 B5EA168A58C; Thu, 28 Jun 2018 03:51:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f177.google.com (mail-wr0-f177.google.com [209.85.128.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B2CC68A56F for ; Thu, 28 Jun 2018 03:51:39 +0300 (EEST) Received: by mail-wr0-f177.google.com with SMTP id c5-v6so3704216wrs.10 for ; Wed, 27 Jun 2018 17:51:40 -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=TQqUGOxJmEwSVZANSmjQPSQ9/0+dwjIw+r1qpsNzHOQ=; b=Yg+0apyflEn0c6ZhKVWpZfTYyp8u9fFuQ6q5Lvyd0uTKQRWd0UmsIJ5e8gLmpywmoL 0yvwX6XtsA6qTOFgNurHrDEgQOXoP7pew8XbUGGhIS6mhFoget+cZiHjrRVEW12GXB+C LLUGO2O9rX9xCQH6FsEr3LVv/C2jyHKhHva8Yg/BcJ69PoBebUJW4UiEVQMzytYne7Yg bTuAX2natHRYZtCNmgBiNVatEmLGwDIlc5U4XyNhos1Rcgyhj1ekI7zJ/w6SC34jvbMO VGyRt5vIqrTTjj21ka9wTwc8jnRyFWDR/FqC1jpuP5412ng20+SFFgvyEdC6iOsVU7J7 Cg1A== 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=TQqUGOxJmEwSVZANSmjQPSQ9/0+dwjIw+r1qpsNzHOQ=; b=riA2IC0FDro94q/gW4fCTvo2RINxTeM9oRfGU2NCx5WeiyDupoopi5QL+AcjQR8LMq anxtDgPy3Uo0Nde43wh+NaE2ar52vUMKVoOgHFeHQjVCyXjm5cWtLqhtRJ18/oNBTtg9 +FzNalJmoU+qsedRwIwgFxR+LciCxsq8HmqgGkdoFu6yL72yJDu5i00oMQw23BbBZ1tO oyDmP68UYsZdKBbkvAzdMBnEpT4NS+0BQiBI9yCj/C4BkoAFnNUKDwaFYBmrpZ+PlHbO 5JZMsp9U5q9kRz7zRBUeMf78WaP6mwtew4ZXy4ybqIPaFV1LGk4wojOm4DlcCeNI9i2c wueg== X-Gm-Message-State: APt69E2/1dGeWDKcdD13Je2DUtZh5Ft2FZpQUsRK4q+Gu0OVAPHXdVUl e6lkIAZOF6b4t5Im53hGSJ8J/w== X-Received: by 2002:adf:8b01:: with SMTP id n1-v6mr7016099wra.282.1530147099756; Wed, 27 Jun 2018 17:51:39 -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.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Jun 2018 17:51:39 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Jun 2018 02:51:11 +0200 Message-Id: <20180628005117.18902-12-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 11/17] lavfhttpd.c: Adapt to new interface (stub), fix includes 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lavfhttpd.c b/lavfhttpd.c index 3f29ec4..7c95001 100644 --- a/lavfhttpd.c +++ b/lavfhttpd.c @@ -21,6 +21,7 @@ #include "httpd.h" #include +#include int lavfhttpd_init(void **server, struct HTTPDConfig config) @@ -57,13 +58,13 @@ int lavfhttpd_init(void **server, struct HTTPDConfig config) return 0; } -int lavfhttpd_accept(void *server, struct HTTPClient **client, int reply_code) +int lavfhttpd_accept(void *server, struct HTTPClient **client, const char **valid_files) { AVIOContext *server_ctx = (AVIOContext*) server; AVIOContext *client_ctx = NULL; struct HTTPClient *client_http = NULL; int ret, ret2, handshake; - int reply_code2 = reply_code; + int reply_code2 = 200; // = reply_code; char *method, *resource; if ((ret = avio_accept(server_ctx, &client_ctx)) < 0) { if (ret == AVERROR(ETIMEDOUT)) {