From patchwork Wed Jan 24 07:08:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 7410 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp413533jak; Tue, 23 Jan 2018 23:08:36 -0800 (PST) X-Google-Smtp-Source: AH8x224C7hB22iWUw2HxxS/YWWITuyv53YdOTaCrQ+Qnof09zTgS55hwBdiOjRamZ+nC/i7qwi0G X-Received: by 10.28.21.73 with SMTP id 70mr3652494wmv.152.1516777715994; Tue, 23 Jan 2018 23:08:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516777715; cv=none; d=google.com; s=arc-20160816; b=lUZi0gwCXzWQhiAIoDIn7rYtiO0t9Y2Phn14SJjk/KJKJ6UDVQMxeOc0+IkNOZo9nN dsY0FS/6mOIdYF4lJw8OXfxVuqrGcTvhr6EMt8IO4BBpbbewIKdhFgQtQZcUBotHezl9 A/3N9oTEAnJgitmr22ZeOm5DWEHkeFSMzAyii/2C6RCt8ALaGx/S99FBIr8wMYbPDzzB L5oeIecURSFnhuJ6MuzgycKDsMAPj8IOEDnW/TXP2fd2jCmVo9xAq8z4ecu06BiyK5VL VDlHSldsSj3eL+k/Shk0UNV7ad8438mk8u5ggec6zWqGXZ4aTDHFfMzcY59yAxmRkJMF r7KQ== 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=Lnx8eqRMs413LP1zv6rFl/Eh/lwzXdk0UCQKEV+FAXs=; b=CIFQ0xbCypqSNhL2jdKuogp7MbE5KHM/POZd8qIc5yMfEylxkgTP4XcYfNMK8Q11bh XS84bE6pVBCmznvQslug6HnA28z4PFJX0+gFoeCRsBIZeVHo3LPGqtx86cDVk72ygtKn MvfVh0wX1B5rx0+iMq4JeTEJgVZZZDTsnVzskbCkE0XZERd5lDREFfCxxj0EbMVMluZK nmodeEeYdgsdQbzrGADf/f5F3ofRiq4CxpXj8VpKa3i8pjfAkcyxzOd4qLaEZbLWQp46 agHgemlIgQ/q7EHM4QGWRgXBYG48SI6FE43ZdUty6vTyoYzf3OTV5bFm8hWNaZidZv7H nLIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=kyRlHnMY; 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 l124si428300wmb.100.2018.01.23.23.08.35; Tue, 23 Jan 2018 23:08:35 -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=@googlemail.com header.s=20161025 header.b=kyRlHnMY; 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 6BCFC689B65; Wed, 24 Jan 2018 09:08:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EFF2A689A81 for ; Wed, 24 Jan 2018 09:08:10 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id r71so6379081wmd.1 for ; Tue, 23 Jan 2018 23:08:13 -0800 (PST) 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=y7ZQtAbkqWSm1PFWyXvxVItazV9dds2a0ezWIQ7rpWM=; b=kyRlHnMYvk553ZvuqnCs4/ej3MX5xyxNJRoFBCZ7T52WRpbpvPxqgva+T5axW2wXPF GL5r4Jn5xiUsnR11Lz07uEDSsm1+V88CuSRmAZWOXy1IdGgWUGoU3xQl5AvTC9g3L4lr xswzOcH3nBiB9YcvS/sBZVnz47rgVKWS5rNtGfiaYDF4l07EPrBK98fSvoXpfi7H08l7 QQ0c2eP6PVC7NCIX1rMUdw9sMRS8ONmtAjfW30X5RI/yHtmTq9VpCMUfHmaNdL4IOV6+ eOAd4VNeNWzlqDdQbmZFu5feMLCa7PkPCGRBAO8OlRsfMTBz6jd4vTSDKjWrJQL75133 PU+w== 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=y7ZQtAbkqWSm1PFWyXvxVItazV9dds2a0ezWIQ7rpWM=; b=N5qx66kmxgUop5sH/KkdFUr/YKcw4pMgiJitMifuHY+m508whSBj/6d6YzBT+4Bkyx hFbAdA16KaAl8F7ufVHp63h689DrxZoLEknXRYSW6NgNpdwRqs7Et206CEDt6qQlusWB 51Z0bRdrLA+8062QFW95I8SUHf92pVfNDj5StGMuV1/gg8eUbBI8t8EG+KkjvrpMZQlG S2R8skimU8a3lioXBKALlBw06IRvZw5gEocOHguzP6UdhilUscPc56BpSoHbek/bv5El n6Q9lb+hqExK3qvfQtNvznocGO+RL5MNaCxUM8TuPGLx286k+r5Qd+zUMDinysmtZjOc nVTw== X-Gm-Message-State: AKwxyteKEdPMFMV+IVY03QCB40dOWvEbZA4BwWev2DNLhyCU2dBTb9tf nOfuqfbE9BovZPZMlPbt+i/o8w== X-Received: by 10.80.139.155 with SMTP id m27mr22430762edm.98.1516777692827; Tue, 23 Jan 2018 23:08:12 -0800 (PST) Received: from debian.speedport.ip (p2003006CCD4EDC88CCA764404E41D15A.dip0.t-ipconnect.de. [2003:6c:cd4e:dc88:cca7:6440:4e41:d15a]) by smtp.googlemail.com with ESMTPSA id m15sm10517131edj.41.2018.01.23.23.08.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jan 2018 23:08:12 -0800 (PST) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Jan 2018 08:08:23 +0100 Message-Id: <20180124070823.17373-3-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180124070823.17373-1-nfxjfg@googlemail.com> References: <20180124070823.17373-1-nfxjfg@googlemail.com> Subject: [FFmpeg-devel] [PATCH 3/3] hls: don't print a certain warning if playlist loading is aborted 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: wm4 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" AVERROR_EXIT happens when the user's interrupt callback signals that playback should be aborted. In this case, the demuxer shouldn't print a warning, as it's expected that all network accesses are stopped. --- libavformat/hls.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 6e1a2e3f1e..02e764f932 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1422,8 +1422,9 @@ reload: if (!v->finished && av_gettime_relative() - v->last_load_time >= reload_interval) { if ((ret = parse_playlist(c, v->url, v, NULL)) < 0) { - av_log(v->parent, AV_LOG_WARNING, "Failed to reload playlist %d\n", - v->index); + if (ret != AVERROR_EXIT) + av_log(v->parent, AV_LOG_WARNING, "Failed to reload playlist %d\n", + v->index); return ret; } /* If we need to reload the playlist again below (if