From patchwork Mon Dec 25 19:39:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 6962 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp6073086jad; Mon, 25 Dec 2017 11:47:20 -0800 (PST) X-Google-Smtp-Source: ACJfBos1ZYjwRgt0P3kyy+zls5V7migrBWYNH8jW9SNw5+cUeZ+O4vLSi2jY5qJEY4n5NAG3xlS0 X-Received: by 10.28.105.134 with SMTP id z6mr12013368wmh.124.1514231239994; Mon, 25 Dec 2017 11:47:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514231239; cv=none; d=google.com; s=arc-20160816; b=ia7aAH/TT6tLVMib8/5uiFWj0v1yXjQ5bzIoAaTrYsOSJegDt/1W5wmDwluCP/4Ngm I1tS47X5wuQpswQNEOroQF6/qQN7+dpU/p+y5kPDGdV5b7Mm+c7lNxMEg/zAtwOPefTK 1HFOrROIZjeXN7TmjRAA1xFcJR0UXprTk27T/mi/XlLsOO/PsNtKxIw95pPek3ObyXeJ wZGeBpCEQQW3Oex7joAcvEq4ttrkZiugGehZVJauI7n86Okvwj6nmi9/QA4rN3B6WIo6 eVuCLmrF+dR5WasgMuKh63xyqO31meMOrorG05SddZVTc6rC0A+ig+pREC1nEFaVR5XJ tUZg== 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=bOAtO3BlnD5bR0IGku9f9jDmIwq2bDCzIQyQJPB7JBI=; b=Vuq1km+85WjTi8rCGCl5pkuvxSjfllXxygdLZX5I8SD6ghWneYV4IzJ0EDhCbwHVOK JSdOfi7e3BSaS65u91CY1Au8gzN/2ofBNQY7NGOefNF4/P13EAxOH4boLO2WmjFZMKNZ yk0AWYjTjoK/rDZeTIsreHjQ4hMQmtJWopeA7QAosYT1fP7aUc69T+53JTTHvz7+udVj vtLhGm+bxdrsYwMmQvfHaDOVfa7ZZNwXO0gRXb9uWCNlInmBu8ovEz6FRyl88Jc/UKEk 2RXBEvmcjbUZGihmOkw8BX/9ynI2ZS0IVu5E+p9iCVFcBaxRkofRfXGLomOBk3cd3YjS nKag== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=UkHMppRn; 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 m74si11180500wmc.153.2017.12.25.11.47.19; Mon, 25 Dec 2017 11:47:19 -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; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=UkHMppRn; 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 60ED4680C25; Mon, 25 Dec 2017 21:47:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 036C668044D for ; Mon, 25 Dec 2017 21:46:59 +0200 (EET) Received: by mail-pf0-f194.google.com with SMTP id j28so18066197pfk.8 for ; Mon, 25 Dec 2017 11:47:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=BMhdehnsltoscIaY/rSR49fE7hzuoTEW8/QeAscVpwY=; b=UkHMppRnwQNZAnjzAzVIBf6YcL9H2r5jMVgUd1MHL/erEOJheWxOMvSmN9zrWK++Nv KxawPk1zcaWeSbfu37M1BuzRNa+igr+rEe9Nn8HO832LzjDCHoDf7VHI/Q2BSHwOfM3f SeUMx2JzQUwl98mgn2qW6uOl5GN6Se6DezkV0Fq56uFTGv2JKTQbbTi52SAL1xXxopV/ LYIdP2GMDJQZ8fYd3I+1txOhWo6kSMbxrxr/Jt8hKJdBS7BPqxNGpNit3cEHbnVLvEvu /W8UPzIpQ1lj2qhTlxdKOuzcx99kH84Gwu+EuOLrTvykhnvQ12mFMzx1HBd9q4OZc2rK zPAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=BMhdehnsltoscIaY/rSR49fE7hzuoTEW8/QeAscVpwY=; b=bJR8ZlXi5fBAVX6wH9DvvYWkKusgH0KIzNTXODBSTLf5ikOFfoNkMR/jLUmdOjK96U +WeWH31ozv8upFELp8lstmk0DtTdi2GCNvlsAY5t595OfC4+d6AKsUCRnWG5MhoGDjUq W+cg3AHH1yMtvLa5gn2iM87mYF383hmVUlAvca+WY4ZZowW72hPZ2sdsoQ/a6ntcew2C 7orNF/X2O9KWDPHSIYbM9xKHlwn2YPKkTyHbbmVs0Gsc8suO9XaFTn513cE+RZHmcD+k CsFsZOxr6eLMO20Vidlbsu0IofeNR6FAxn4uKoEvXVI2RE94uOs9eptXf0p04dJbmbFy nfrw== X-Gm-Message-State: AKGB3mIh33QppVaxpWk44rX+JPbAXuoq7gykGC35csNb88M0MckDpzU0 yQQDsjCgrGWXxZhr70TWJR2cX0Zl X-Received: by 10.98.200.20 with SMTP id z20mr23212131pff.108.1514230753799; Mon, 25 Dec 2017 11:39:13 -0800 (PST) Received: from localhost.localdomain (c-69-181-54-242.hsd1.ca.comcast.net. [69.181.54.242]) by smtp.gmail.com with ESMTPSA id u6sm58936997pfk.126.2017.12.25.11.39.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Dec 2017 11:39:13 -0800 (PST) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Dec 2017 11:39:04 -0800 Message-Id: <20171225193905.84024-2-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171225193905.84024-1-ffmpeg@tmm1.net> References: <20171225193905.84024-1-ffmpeg@tmm1.net> Subject: [FFmpeg-devel] [PATCH 2/3] avformat/hls: return AVERROR_PROTOCOL_NOT_FOUND when http protocol is not available 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: Aman Gupta MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta Signed-off-by: Aman Gupta --- libavformat/hls.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/hls.c b/libavformat/hls.c index f00e22dfef..73bf55b791 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -611,6 +611,9 @@ static void update_options(char **dest, const char *name, void *src) static int open_url_keepalive(AVFormatContext *s, AVIOContext **pb, const char *url) { +#if !CONFIG_HTTP_PROTOCOL + return AVERROR_PROTOCOL_NOT_FOUND; +#else int ret; URLContext *uc = ffio_geturlcontext(*pb); av_assert0(uc); @@ -620,6 +623,7 @@ static int open_url_keepalive(AVFormatContext *s, AVIOContext **pb, ff_format_io_close(s, pb); } return ret; +#endif } static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url,