From patchwork Mon Apr 2 02:18:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 8280 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp2061771jad; Sun, 1 Apr 2018 19:19:13 -0700 (PDT) X-Google-Smtp-Source: AIpwx48WBntSb57/HPTAimkxcOI/RvKKUMuUjmq6IQi8af90Js3IdnchlWdPBmHuK3rALbFcTagd X-Received: by 10.28.66.206 with SMTP id k75mr7736116wmi.34.1522635553369; Sun, 01 Apr 2018 19:19:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522635553; cv=none; d=google.com; s=arc-20160816; b=HDWBHp5dWceYZaHDaw8/GLxuSwNSJhNSy+DWA9ZTqSJLSOJVZeYHB7OR4S2TlbQcAJ QWvTQxEacBEjAm5Oxw32g8869m8n/qond6HGd3hGgMjyS0/P2rOxRoSqx7saMAsDdIKv 1MgGnj/r93abqWavHrtyplcSWKJSwOJkESpQlWzsaptnOYNEyUOtz82RY4tOxmSlm9Us OPY1xfixlZFD3pMP4FBpiVV2fI/YZ0dLCIg/LCwq512rhNw5PGGUOho1+UabgeBNlpAr p4hkCJHX8LpkYc1kN15fgrhdx2OTDsKScxMdNjzJmYpLxhKglGYU5ud3MnxDvk10QIvy 3hOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:to:references:message-id :date:in-reply-to:from:mime-version:delivered-to :arc-authentication-results; bh=7IvG/xNhr5HvGdTSolBaZ28/bqy6hm6F9HwgBQb12fk=; b=NKLzPFC+1EV90Ma5ITRI1oeXjYPWABtYb2WOLQRMDaWvThU01jIeK/ClzEKlKJO3wI ZzTkUJ5CCpkXP4Ive340sfCGhWZabU+CBbf0NAevB0tVTSyFjeRaVbjRRomWW+RpUo5c Ap1MySDvShqJ1DwWyZQUNahC1qS7hYHVQ+XTZbXNjw2jh2NuYncmWkbWBbsgYam2t/ER gF0jyoA9gIsb16Qx5avsvavKrvsldA4nFXNkuBqERtMyLn0JB8LygFwO64+fCb08iigr /wEyu+bEyy8GR15qtE7EnVDgaQvy3d/eLNp2Im5Mfy4asceBrxojoVa0AngpYcfS25nM SvsA== 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 91si10223751wrr.385.2018.04.01.19.19.12; Sun, 01 Apr 2018 19:19:13 -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; 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 076CE689C88; Mon, 2 Apr 2018 05:18:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg291.qq.com (smtpbg291.qq.com [113.108.11.223]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D9C9689C5B for ; Mon, 2 Apr 2018 05:18:43 +0300 (EEST) X-QQ-mid: bizesmtp13t1522635506twx461ix Received: from [192.168.3.21] (unknown [121.69.97.6]) by esmtp4.qq.com (ESMTP) with id ; Mon, 02 Apr 2018 10:18:25 +0800 (CST) X-QQ-SSF: 01100000004000F0FKF0B00A0000000 X-QQ-FEAT: eymbcWkCW5zewTandZkPa7jyaRZvs7ptcgICOFQ77URP7qEQ3vV1e0FNQMUJX 6rQE+XnxFAoPeLQkfsf3/HBKCkjYOl1HvLZpngl/gnDyV9p+6Qkxe9EqmUKpGs3TFMjhGwT wjyRIoYSoWot5A/c4qpZ9rIpUWk7ThcNs0yyOREhhYvvWMZz615K+AT6Y2cZ5JDIIh45R4a c+9t5RzuU4jBqxh5tcJS880d9Y6TPBCZox033eNC8TigI1oDO+0QtVC8jPtOI9Wa1cPq/o9 f3I6f61bd5PH2f5LOYX3B0BiuqHEbjU4gYsA== X-QQ-GoodBg: 0 Mime-Version: 1.0 (Mac OS X Mail 11.2 \(3445.5.20\)) From: Steven Liu In-Reply-To: Date: Mon, 2 Apr 2018 10:18:22 +0800 Message-Id: <0021CC43-4D3F-4B2E-8114-526D4C98F091@chinaffmpeg.org> References: To: FFmpeg development discussions and patches X-Mailer: Apple Mail (2.3445.5.20) X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign4 X-QQ-Bgrelay: 1 Subject: Re: [FFmpeg-devel] [PATCH] lavf/hls: Remove the dead code in parse_playlist() 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: Michael Niedermayer , =?utf-8?B?5YiY5q2n?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" > On 2 Apr 2018, at 07:09, Jun Zhao wrote: > > <0001-lavf-hls-Remove-the-dead-code-in-parse_playlist.patch> From 96de206d191264d2a5aacff5f877caad1d861439 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Sun, 1 Apr 2018 11:17:45 +0800 Subject: [PATCH] lavf/hls: Remove the dead code in parse_playlist() Signed-off-by: Jun Zhao --- libavformat/hls.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index c578bf86e3..ae0545a086 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -743,7 +743,6 @@ static int parse_playlist(HLSContext *c, const char *url, } if (!in) { -#if 1 AVDictionary *opts = NULL; /* Some HLS servers don't like being sent the range header */ av_dict_set(&opts, "seekable", "0", 0); @@ -766,12 +765,6 @@ static int parse_playlist(HLSContext *c, const char *url, c->playlist_pb = in; else close_in = 1; -#else - ret = open_in(c, &in, url); - if (ret < 0) - return ret; - close_in = 1; -#endif } if (av_opt_get(in, "location", AV_OPT_SEARCH_CHILDREN, &new_url) >= 0)