From patchwork Sat Oct 8 14:02:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Thelen X-Patchwork-Id: 909 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp1821064vsd; Sat, 8 Oct 2016 07:03:52 -0700 (PDT) X-Received: by 10.28.35.70 with SMTP id j67mr1825703wmj.24.1475935432124; Sat, 08 Oct 2016 07:03:52 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bp10si26953323wjc.237.2016.10.08.07.03.51; Sat, 08 Oct 2016 07:03:52 -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 E6D79689BAC; Sat, 8 Oct 2016 17:03:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from caladan.c-14.de (caladan.c-14.de [78.47.48.217]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 89A1F689931 for ; Sat, 8 Oct 2016 17:03:21 +0300 (EEST) Received: from salusa-secundus.dune (HSI-KBW-109-192-116-148.hsi6.kabel-badenwuerttemberg.de [109.192.116.148]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by caladan.c-14.de (Postfix) with ESMTPSA id A93F462F80 for ; Sat, 8 Oct 2016 14:03:37 +0000 (UTC) From: Simon Thelen To: ffmpeg-devel@ffmpeg.org Date: Sat, 8 Oct 2016 16:02:42 +0200 Message-Id: <20161008140242.11665-2-ffmpeg-dev@c-14.de> X-Mailer: git-send-email 2.10.0 In-Reply-To: <20161008140242.11665-1-ffmpeg-dev@c-14.de> References: <20161008140242.11665-1-ffmpeg-dev@c-14.de> Subject: [FFmpeg-devel] [PATCH 2/2] libavformat/segment: reindent 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Simon Thelen --- libavformat/segment.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavformat/segment.c b/libavformat/segment.c index 82872fa..98e7bcc 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -69,8 +69,8 @@ typedef enum { LIST_TYPE_NB, } ListType; -#define SEGMENT_LIST_FLAG_CACHE 1 -#define SEGMENT_LIST_FLAG_LIVE 2 +#define SEGMENT_LIST_FLAG_CACHE 1 +#define SEGMENT_LIST_FLAG_LIVE 2 #define SEGMENT_LIST_FLAG_DELETE 4 typedef struct SegmentContext { @@ -460,8 +460,8 @@ static int segment_end(AVFormatContext *s, int write_trailer, int is_last) if ((ret = delete_old_segments(seg)) < 0) return ret; } else { - av_freep(&entry->filename); - av_freep(&entry); + av_freep(&entry->filename); + av_freep(&entry); } } @@ -1060,9 +1060,9 @@ static const AVOption options[] = { { "segment_header_filename", "write a single file containing the header", OFFSET(header_filename), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E }, { "segment_list_flags","set flags affecting segment list generation", OFFSET(list_flags), AV_OPT_TYPE_FLAGS, {.i64 = SEGMENT_LIST_FLAG_CACHE }, 0, UINT_MAX, E, "list_flags"}, - { "cache", "allow list caching", 0, AV_OPT_TYPE_CONST, {.i64 = SEGMENT_LIST_FLAG_CACHE }, INT_MIN, INT_MAX, E, "list_flags"}, - { "live", "enable live-friendly list generation (useful for HLS)", 0, AV_OPT_TYPE_CONST, {.i64 = SEGMENT_LIST_FLAG_LIVE }, INT_MIN, INT_MAX, E, "list_flags"}, - { "delete", "delete segment files that are no longer part of the playlist", 0, AV_OPT_TYPE_CONST, {.i64 = SEGMENT_LIST_FLAG_DELETE }, INT_MIN, INT_MAX, E, "list_flags"}, + { "cache", "allow list caching", 0, AV_OPT_TYPE_CONST, {.i64 = SEGMENT_LIST_FLAG_CACHE }, INT_MIN, INT_MAX, E, "list_flags"}, + { "live", "enable live-friendly list generation (useful for HLS)", 0, AV_OPT_TYPE_CONST, {.i64 = SEGMENT_LIST_FLAG_LIVE }, INT_MIN, INT_MAX, E, "list_flags"}, + { "delete", "delete segment files that are no longer part of the playlist", 0, AV_OPT_TYPE_CONST, {.i64 = SEGMENT_LIST_FLAG_DELETE }, INT_MIN, INT_MAX, E, "list_flags"}, { "segment_list_size", "set the maximum number of playlist entries", OFFSET(list_size), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, E },