From patchwork Mon Dec 25 03:48:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 6958 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp5352898jad; Sun, 24 Dec 2017 19:48:39 -0800 (PST) X-Google-Smtp-Source: ACJfBovkmknC4h3wcMwTdQ40zga+C1Tk3oKHBSF8HuQo6EHe/iy9HTkp6kYLNPutX56wL+DOIHUN X-Received: by 10.223.136.243 with SMTP id g48mr13347927wrg.247.1514173719391; Sun, 24 Dec 2017 19:48:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514173719; cv=none; d=google.com; s=arc-20160816; b=YIJiTwICVPbEfkcY+Lv84SGZFUidfOYl/KWmyaDXzKdEMZW8T29FlNyIxDOvXmaZWh QtrAGZ1nsb+hirlF5+fmMdVzGdhzrr38tijxv8mj8qGwUi7ZlMCbqdrYYlhC3dohnmtQ UTU/p24RfO1K+qPe1aR5LAEkcmqXRguUmGIjDeRQRmzj0j2xkdI3O60T+SSAUPCcgjNd yue7i42QaebDwHQSirFEmARR9uCz5qjHRn6uLN2HOsQSYD/tJB27c1xvWtyDdGZgEcQg xXaPZYuZL0p6FnixMF8wtypHwgvYeghhp6msMqxjcUIH6jFckhWzQ7iGvyXJZAQNLBMo quKA== 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:feedback-id:message-id:date:to:from :delivered-to:arc-authentication-results; bh=iXaCvqItnAIbedDhGimAcDuITDBx+L3rer4mvv7H5s4=; b=R8Ni8Q/Xx3g2f50AdFAJepPE2jMlNDmylQqlbIxicuyPkxVnV0K/LWhTs45Z8UY4gc wFvls/7IgxzVBZNq5fYBZMxH1Mh3tINTbP0Dr0cKRpzVqosuxfL0uKwePBrtRI4vbM4a WkUGGbljMnyZC3BrFOyZ7N8RTvc5GZZCNkHMj9+8Z9tq26fs4u3Rvs0CvQ8QeCtT+B+P /PC7NILt/b3ivXGi7ueB9l7GipwqDrgkeONus9DSnZAO6tErzQMk4/pCrnM8WlcSn7fz DD2g6xZcgrZg27Q3XD65qd9B4XFZBhqNq/za04vBrfeAwAnNO9vvqWl8rT2qg2KCSFnU LoGg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m10si15024874wrm.130.2017.12.24.19.48.38; Sun, 24 Dec 2017 19:48:39 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 200456808B4; Mon, 25 Dec 2017 05:48:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg65.qq.com (smtpbg65.qq.com [103.7.28.233]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 406DA68065D for ; Mon, 25 Dec 2017 05:48:16 +0200 (EET) X-QQ-mid: bizesmtp9t1514173690t2disn7hm Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Mon, 25 Dec 2017 11:48:10 +0800 (CST) X-QQ-SSF: 01100000008000F0FKF0B00A0000000 X-QQ-FEAT: oGLsAtV5lZLk7W1lzFtZVGn9+oCNJVYv5QKhfm+pAhpq6UXM1Nw4hlPpMUMSw mcVVgODXaFWQue58ngxGaxrwNq5UdWjr+tkhYICqChq3oLQNC15uzSeRsj1bgBzY0FHex2m bXkSioo7MmvJ4/BLT8HAKUlSjEhsdancVHynsy6hg6CvltMV8aUN+CbW6Rzmt2yrgwuC7sZ EtiYU3zhHZ2P2XuJhalJKmGOeteFMlugXAjqhy38vMd8KqxxPKpDdWdyRf6ff4PZRv2hKWt Iu+Rump/FL8kxJYg3akIvyrSo= X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Dec 2017 11:48:08 +0800 Message-Id: <20171225034808.29895-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign2 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avformat/hls: fix compiling error 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: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" fix --disable-network compipling error Signed-off-by: Steven Liu --- libavformat/hls.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index f00e22dfef..51d83b7557 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -611,14 +611,16 @@ static void update_options(char **dest, const char *name, void *src) static int open_url_keepalive(AVFormatContext *s, AVIOContext **pb, const char *url) { - int ret; + int ret = 0; URLContext *uc = ffio_geturlcontext(*pb); av_assert0(uc); (*pb)->eof_reached = 0; +#if CONFIG_HTTP_PROTOCOL ret = ff_http_do_new_request(uc, url); if (ret < 0) { ff_format_io_close(s, pb); } +#endif return ret; }