From patchwork Tue Apr 10 00:34:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 8369 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp458614jad; Mon, 9 Apr 2018 17:34:18 -0700 (PDT) X-Google-Smtp-Source: AIpwx49wuAA1G8TdwGUoZZlOVLEqGC/6emPrhrdQYzIzQKzRjc1pC17NtEi8Ph0JygCNN/Av1y4r X-Received: by 10.223.226.210 with SMTP id d18mr25572635wrj.192.1523320458158; Mon, 09 Apr 2018 17:34:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523320458; cv=none; d=google.com; s=arc-20160816; b=wJSS768v4ZQ5/S7Bz/NkxjW6PSCVTyfbN8s0FZljQSBkEKfOmgcHcZXxZqf7K5DkRA oLSrdIsEmPbBRFc/Ii3mm4iULB4HipWfUysE2Nsmepb8e2f4I68/tPET93QxY4gQo80a JhPw9NlwfDNH2bT++jFuyupVyyANcdq5/nDkISie2CEMgAyRzimk/Q9dlVnJAMjpb+gA ZPH2asaerEf9RhIo21rEll7boC/sSXR6q49f+3vBQ72SaaH0j9Yu6RvN4VYTzZ6ftUVF clGZEbjmz1+plJWP8fwvilZsoXOFcKwsKYjbOwsVWbuxzNkqFXp45uEo63Bjwh+NmhmI FNGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=aLBADy1PIaODBuzmaAMCluBemFXBZpU2wUaYqfhPZow=; b=gpYsQQVTvxIoXRWVYgJuxLdUIShW53WzEEoOPpYGw/Pq23puKp8HrB/NG+Z7jJKjC1 GBBuCoF3rU1ev5Mlnkyj8f8VbtGwqC39iutpFynUsizXwK2oItfQssWBZuzISoCJN0W9 3qFpM7jGtAkGpt+ZihN7pgK4ADv1K0XKv7FF4kg5qy2AKVdDC05KDEEZp7jhZWpHkbA9 1ex5LSb/oi3ieO+kwYuJ1xQ6/DzKg0sx6b/AGAqY+6cyAriIC66Gci1iHciMwpOKvvAP HrDVYGUgl6/u9vqykpfoEEKO5ZeJPXmPIZItDiGSjq4DOzARHenT7p+32joZPa+04WZG 0CuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=KRPurzlt; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x127si331666wmb.262.2018.04.09.17.34.17; Mon, 09 Apr 2018 17:34:18 -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=@gmail.com header.s=20161025 header.b=KRPurzlt; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 044FB689EA5; Tue, 10 Apr 2018 03:33:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f46.google.com (mail-pl0-f46.google.com [209.85.160.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1451D689FC8 for ; Tue, 10 Apr 2018 03:33:46 +0300 (EEST) Received: by mail-pl0-f46.google.com with SMTP id e7-v6so4232577plt.6 for ; Mon, 09 Apr 2018 17:34:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=l1Y3aPOARtlqlwwRorvwOsW/Jwbc80YjptOROqaEvjs=; b=KRPurzltirBoEWmjRosGd1Wn/hbyhhw/XZ/YzTwTVi/88I0BPpGkXb3ijm2FqxoG5t 6AQXXWc+Im/Xnf2UaO1oJi02iXledw5ZQEB7W/kyk/SojIIbL3ts4H4ue5L1jV9eophS 7SsnvJrGVgmrr9jqYvDuz62IHXZO/EZndsalnuq13JbfbBYPadS4JU38tTvPCMgSPCHb rUu2hiB/U2kZKlu4IfrGkrHk5rwpUrtQtQCes4MnKSsUD2S2tSjIg8jUI3vTbDcJA9wK zdzYtZ2sIUz0vGe5yx+F3B6ZwjXHGiCvyj2T4X8Czd8ObwQyFmvIxJFpgobv3Ec9N4D0 pR3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=l1Y3aPOARtlqlwwRorvwOsW/Jwbc80YjptOROqaEvjs=; b=mPUHH3hT8iq0hNW48P3Bx5IqBd7fydyu70ktzR5Ur3OciAHsHGNtPN86Nnnl5a7jZu fg+JTiYIlVBjpNp5FUMqoj8p9ZrQqZyrjqOmOTBdAmaz+wIH9vnLOTJbZ/jjBAgndtcf bVfGsLr8+BmNT4edFwq0to/bR98cul/CAeq1lD8nIsV6S/6cHS0KhHYzIDDO1oqz9mgr g+hANjzYiFAs5jtxDJPJxgU/JjLmZg8uWUGXYsTml6npgKGd0egglxqojhD2TVKzKa+G Y4mhLPlEFQAAUulX1TAILbmetOVXS3ZHn9lU65Psk+swHLJVW4eDNVMlYFDxNZYYJRrF c1Ag== X-Gm-Message-State: ALQs6tDRQPp0EnCOdQc2WqaGrrCKgwR6zynH34ARLshIrFm86y2Kcj6I 8oeeg29xqnhrCm+WxoJ6hH1ByT22 X-Received: by 2002:a17:902:d20a:: with SMTP id t10-v6mr7639242ply.151.1523320447925; Mon, 09 Apr 2018 17:34:07 -0700 (PDT) Received: from [10.67.68.28] (fmdmzpr03-ext.fm.intel.com. [192.55.54.38]) by smtp.gmail.com with ESMTPSA id 76sm2092887pge.5.2018.04.09.17.34.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Apr 2018 17:34:07 -0700 (PDT) To: FFmpeg development discussions and patches , Steven Liu From: Jun Zhao Message-ID: <3ff5df99-bca0-684f-4d4e-549fddba2754@gmail.com> Date: Tue, 10 Apr 2018 08:34:05 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH 4/4] lavf/hlsproto: use ff_get_chomp_line 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From beace363b11e4a472d84d001458ffd4017788cfb Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Mon, 9 Apr 2018 23:13:03 +0800 Subject: [PATCH 4/4] lavf/hlsproto: use ff_get_chomp_line Signed-off-by: Jun Zhao --- libavformat/hlsproto.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/libavformat/hlsproto.c b/libavformat/hlsproto.c index 2b19ed0cf6..e7ef2d88ea 100644 --- a/libavformat/hlsproto.c +++ b/libavformat/hlsproto.c @@ -69,14 +69,6 @@ typedef struct HLSContext { int64_t last_load_time; } HLSContext; -static int read_chomp_line(AVIOContext *s, char *buf, int maxlen) -{ - int len = ff_get_line(s, buf, maxlen); - while (len > 0 && av_isspace(buf[len - 1])) - buf[--len] = '\0'; - return len; -} - static void free_segment_list(HLSContext *s) { int i; @@ -122,7 +114,7 @@ static int parse_playlist(URLContext *h, const char *url) h->protocol_whitelist, h->protocol_blacklist)) < 0) return ret; - read_chomp_line(in, line, sizeof(line)); + ff_get_chomp_line(in, line, sizeof(line)); if (strcmp(line, "#EXTM3U")) { ret = AVERROR_INVALIDDATA; goto fail; @@ -131,7 +123,7 @@ static int parse_playlist(URLContext *h, const char *url) free_segment_list(s); s->finished = 0; while (!avio_feof(in)) { - read_chomp_line(in, line, sizeof(line)); + ff_get_chomp_line(in, line, sizeof(line)); if (av_strstart(line, "#EXT-X-STREAM-INF:", &ptr)) { struct variant_info info = {{0}}; is_variant = 1;