From patchwork Fri Oct 27 00:11:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 5708 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp103638jah; Thu, 26 Oct 2017 17:11:45 -0700 (PDT) X-Google-Smtp-Source: ABhQp+Q9OPimgla9p92E903WvB37/clO/K8qXD2Ssvu9RUOEiSR1K5T3aYgroVYbdjZ9WpgvG5f/ X-Received: by 10.28.74.86 with SMTP id x83mr464956wma.146.1509063105136; Thu, 26 Oct 2017 17:11:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509063105; cv=none; d=google.com; s=arc-20160816; b=ly4vvG6886dAkc4HZ72zwH9iJVYxLAcblnUPiKjvN1kOLcmVFlbiWs7sSF9M/CjAWh emcJKTR3REcwHnb8/w/LLr5wGHnGzbHVNOeOEfsrRdWB1SnCOLujn7sbtYEAjcoh6i8W YMPRwu9dmGBEYr6t+ffWdNV4+daKviTZ9PhYkkAmL1Dk5XDdXmVGuaGdignhmaHp1EC6 2UUApgMBkT23sAvYS3dBonTQfzYU6AakHEhw9kIi+HsRwx6T1Npr9u42Fn0EBCBstLxd 8kPWCy+bIrVGcq5DndNxE+8WDI4DSNc7rU+p3+LNIq2YzfVrKEszc+uWAeuTa8Uc1pQb CHiQ== 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=lILLeqIhkspgLVPKSkdBJQaevSQexrMn6WnGOon1dyU=; b=Z9wRjZMoXZk3s++I//yLeLPhXwCVQnJ8M12NroH9uVxZqnCCdkp0oiOo+r8QKFSiIm dWV7Yw3Qdb7SsF48UekOl03pJArtKvhlhm6wR9MrksO8b3pc6UFquzUzHAj88bIZhTf/ /cIeWaQTbQrDI25666CM3H0gkrl87LIBjcdW8lXmblT6sUErUUqJt8boAZjWm3fdihRU govM2rfmhQMlkIyP86vk9x+ssOXhBBRFv7/ydeyOgIFP7cPf2k9hDEVqaiRfiO6AMw1c 7qI2YWitPPmOWulMfkiEoskepE5azAzvO00GvpmgmMTjyFcEcKUnIZ1uBm4vOwSeH0BR MWyA== 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 h29si4759256wrf.216.2017.10.26.17.11.44; Thu, 26 Oct 2017 17:11:45 -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 EBFDD68A243; Fri, 27 Oct 2017 03:11:35 +0300 (EEST) 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 24E0868A236 for ; Fri, 27 Oct 2017 03:11:27 +0300 (EEST) X-QQ-mid: bizesmtp15t1509063089trpwa066 Received: from localhost (unknown [223.104.3.172]) by esmtp4.qq.com (ESMTP) with id ; Fri, 27 Oct 2017 08:11:28 +0800 (CST) X-QQ-SSF: 01100000004000F0FI60B00A0000000 X-QQ-FEAT: PML9g4LxpBqrwr2R/BrvSUWZk+ZAxYUKf2T4RqrwosOWdKbT2wj7oiu6G7L+2 m/HewGhn+fRHP59fVYPvvGLAQf88hDcWL0tJ+7C/HJ+IsB3xEuHmuoPvlW43co7yx1gA/jG WYEiN7NQ2Ks0nus0KNxQGzdATzPhFHgczkyExcL5Am5RWGKrxitupwibyJgNuET1TFRMgLA 6HeusSxj1NhMYjP6nvuAZwOAAdFP7V/HDYx2NGa5N0jU93RrlhWBe3NdBn7BN08yOR99ZhQ DhENZdgUDLEVCUgnmZcOxX0yHYWl7X9xF3eA== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Oct 2017 08:11:30 +0800 Message-Id: <20171027001130.36902-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.11.0 (Apple Git-81) X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign2 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/hlsenc: reindent hlsenc code 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" Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 530fc11305..0ea93480a5 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1081,13 +1081,13 @@ static int hls_window(AVFormatContext *s, int last) } avio_printf(out, "\n"); } - if (hls->flags & HLS_ROUND_DURATIONS) - avio_printf(out, "#EXTINF:%ld,\n", lrint(en->duration)); - else - avio_printf(out, "#EXTINF:%f,\n", en->duration); - if (byterange_mode) - avio_printf(out, "#EXT-X-BYTERANGE:%"PRId64"@%"PRId64"\n", - en->size, en->pos); + if (hls->flags & HLS_ROUND_DURATIONS) + avio_printf(out, "#EXTINF:%ld,\n", lrint(en->duration)); + else + avio_printf(out, "#EXTINF:%f,\n", en->duration); + if (byterange_mode) + avio_printf(out, "#EXT-X-BYTERANGE:%"PRId64"@%"PRId64"\n", + en->size, en->pos); if (hls->flags & HLS_PROGRAM_DATE_TIME) { time_t tt, wrongsecs; @@ -1113,9 +1113,9 @@ static int hls_window(AVFormatContext *s, int last) avio_printf(out, "#EXT-X-PROGRAM-DATE-TIME:%s.%03d%s\n", buf0, milli, buf1); prog_date_time += en->duration; } - if (hls->baseurl) - avio_printf(out, "%s", hls->baseurl); - avio_printf(out, "%s\n", en->filename); + if (hls->baseurl) + avio_printf(out, "%s", hls->baseurl); + avio_printf(out, "%s\n", en->filename); } if (last && (hls->flags & HLS_OMIT_ENDLIST)==0)