From patchwork Mon Nov 20 20:40:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 6235 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp4388260jah; Mon, 20 Nov 2017 12:40:48 -0800 (PST) X-Google-Smtp-Source: AGs4zMY3srIoG2g72Smznq1DyRY1XmXZShhpY7fHFJ4uo6jFQCkR9ufYk0oIjoeZcwLP0XWk0c7D X-Received: by 10.223.151.136 with SMTP id s8mr7634948wrb.94.1511210448584; Mon, 20 Nov 2017 12:40:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511210448; cv=none; d=google.com; s=arc-20160816; b=f6q0CbXZypWTXxDavU2FqkA+RKdWvVdQ8hNWtGg4ZqSgNG0m9vS0eIbvOCAkImdA7c J/mIlDxAv7/OD/r8muy17mM1f4+JoedIC5d2B94kv0rLCET9XCHKkOOSXrkSfypHJ/2e nj0WPqAdgpjmJf14/+fW0X34Ny/taEZkilNN98JExt1Js4Kpn0idGoqqtwr+HG2iJx/i XIPPGli/wuf+jdOyffDkG5unBAy0SlcIdZUQFgxJWB6m59txYR+sTaxmKptz+VZ3O9w5 Q5tYDBZ4izsVDLX9z4QxuKrk9ln2QRhYCAHQxuxMdaKsVdot6XoT+2wokpv0ML1jKArO 2DeA== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=BEnQtDCXEpM/9hTi+WMDvE/6Anq/xaTxPWUia5uW62U=; b=bV3yamOTNvEq/quQEHluPaq0h0AJ38wL67H4ZWyxVmkVZ8HmyGKu4DPqCeNvSwcjIH K5COQd2RqRL73KO1eWhm8rLx4hA7J0rWpmmeCyE+H5ee8601BPxEmDXwm8TwqE9+hrbw djmZRPGxHwYR61VIHFkIJN8dnJTrYmYFwzP6zuuJVirCmZ/v/4UBFlb0b7xhhNHafCUE jG8epaOAFk6H0styp07K4mpU2fBsVmvPNJyB1lHj0qKaTMxU1DIdc1FhgVc8UvrmK1rx pSVgrY6dHuoyZYrLE7zdJGnHDTDDkEtw2FQr0e0f+dRWFQDNc9vMQ6b49+6R5eLSEMxF jNAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Jn8hCuGz; 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=NONE 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 u9si8308194wmb.20.2017.11.20.12.40.48; Mon, 20 Nov 2017 12:40:48 -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=@gmail.com header.s=20161025 header.b=Jn8hCuGz; 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=NONE 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 6AFC26883C5; Mon, 20 Nov 2017 22:40:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15A03680C54 for ; Mon, 20 Nov 2017 22:40:23 +0200 (EET) Received: by mail-qk0-f193.google.com with SMTP id n3so9148604qkn.11 for ; Mon, 20 Nov 2017 12:40:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=OFxyv5Yymi5DBWmji+7IqiyRqOPly4/qtxsimPEIFis=; b=Jn8hCuGz9zcVbe9eopPmhikl7XsiiH8CcyieEVBzwfoIBfatwN/NGm2Agyn7vgAg4x aOOXMFA8j2gv3aoM70U5OBtKwHsXm0GJBCJMYNWMke6U26KhHB3VJ4lQZg7A0CLIHAn2 uzomVmaRTFM+KhSCnw4UBGF/kmHJrCSVBxmvHZMmZjcm7E9HYGaMarksjFvZ/Q1/jivI 1EC4vOpb/81pohFcL3Sh01ZxQ5rAdmCdAUX+f+3Q6kc4ni/IwQhwu934aEZ0ERuRaJmA rvdClR2t45qtmZCmG87W4MbyAWO5FuPUPBYpM7va/SAyoWwTCYj6aJUFt1pI9y0506z6 B6xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=OFxyv5Yymi5DBWmji+7IqiyRqOPly4/qtxsimPEIFis=; b=WHNxOkuLNI81IGYbjNwsYbphEd+NIQsAqTJ2f5WlX94p0yQIkuBVL16fPSJB3WouAM WJSfR2jpnV9G9qn7t5L1d7cU5hsMK2wZ9aF5orWzJJEVzULObzpX+yjjyKJ5ZPiaH/KV HaxlEhlQRvUwFeIpjn0YfdzwPpdE1qh55rAfYE8EHv/aFBtJ+gXcxbQ19k1bR8frkq+i 3R8UGjsdLB20E8SQc/6qZdT1kmBnzf3qv5jSFY0RcwvlNrIJ76h7JjNyaAyKe8Qoolsq id5WmJIJKvA4C/n4CD3jEMAa1lxwqfgT2GW299uJ1nrn102reDoxQkuqR7i8VJKIjHLN PUfg== X-Gm-Message-State: AJaThX4vuWkurGf42rPwALA9CWIZCtg/my7bPXGxDuSXmTyewHxEesrc 6vvCiDUPXJjC2gSn8Xr6iz8F1g== X-Received: by 10.55.217.85 with SMTP id u82mr21699868qki.257.1511210439061; Mon, 20 Nov 2017 12:40:39 -0800 (PST) Received: from localhost.localdomain ([181.231.59.220]) by smtp.gmail.com with ESMTPSA id 13sm7730912qtv.67.2017.11.20.12.40.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Nov 2017 12:40:38 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Nov 2017 17:40:19 -0300 Message-Id: <20171120204019.5756-1-jamrial@gmail.com> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH] avformat: rename AVOutputFormat.deinit to AVOutputFormat.close 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" This is more in line with other callbacks, like AVCodec.close and AVInputFormat.read_close Signed-off-by: James Almer --- libavformat/avformat.h | 4 ++-- libavformat/dashenc.c | 6 +++--- libavformat/fifo.c | 4 ++-- libavformat/movenc.c | 18 +++++++++--------- libavformat/mpegtsenc.c | 4 ++-- libavformat/mux.c | 12 ++++++------ libavformat/nutenc.c | 4 ++-- libavformat/oggenc.c | 12 ++++++------ libavformat/segment.c | 6 +++--- 9 files changed, 35 insertions(+), 35 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 322210fae0..811c2ab9da 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -603,7 +603,7 @@ typedef struct AVOutputFormat { * * Return 0 if streams were fully configured, 1 if not, negative AVERROR on failure * - * Any allocations made here must be freed in deinit(). + * Any allocations made here must be freed in close(). */ int (*init)(struct AVFormatContext *); /** @@ -614,7 +614,7 @@ typedef struct AVOutputFormat { * * This is called if init() fails as well. */ - void (*deinit)(struct AVFormatContext *); + void (*close)(struct AVFormatContext *); /** * Set up any necessary bitstream filtering and extract any extra data needed * for the global header. diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index ddad3351fd..fb67d47091 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -225,7 +225,7 @@ static int flush_init_segment(AVFormatContext *s, OutputStream *os) return 0; } -static void dash_free(AVFormatContext *s) +static void dash_close(AVFormatContext *s) { DASHContext *c = s->priv_data; int i, j; @@ -836,7 +836,7 @@ static int dash_write_header(AVFormatContext *s) for (i = 0; i < s->nb_streams; i++) { OutputStream *os = &c->streams[i]; if ((ret = avformat_write_header(os->ctx, NULL)) < 0) { - dash_free(s); + dash_close(s); return ret; } } @@ -1211,7 +1211,7 @@ AVOutputFormat ff_dash_muxer = { .write_header = dash_write_header, .write_packet = dash_write_packet, .write_trailer = dash_write_trailer, - .deinit = dash_free, + .close = dash_close, .check_bitstream = dash_check_bitstream, .priv_class = &dash_class, }; diff --git a/libavformat/fifo.c b/libavformat/fifo.c index c881f31e94..21bda9f36d 100644 --- a/libavformat/fifo.c +++ b/libavformat/fifo.c @@ -600,7 +600,7 @@ static int fifo_write_trailer(AVFormatContext *avf) return ret; } -static void fifo_deinit(AVFormatContext *avf) +static void fifo_close(AVFormatContext *avf) { FifoContext *fifo = avf->priv_data; @@ -661,7 +661,7 @@ AVOutputFormat ff_fifo_muxer = { .write_header = fifo_write_header, .write_packet = fifo_write_packet, .write_trailer = fifo_write_trailer, - .deinit = fifo_deinit, + .close = fifo_close, .priv_class = &fifo_muxer_class, .flags = AVFMT_NOFILE | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE, }; diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 0d924ad758..00104edd63 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -5715,7 +5715,7 @@ static void enable_tracks(AVFormatContext *s) } } -static void mov_free(AVFormatContext *s) +static void mov_close(AVFormatContext *s) { MOVMuxContext *mov = s->priv_data; int i; @@ -6614,7 +6614,7 @@ AVOutputFormat ff_mov_muxer = { .write_header = mov_write_header, .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, - .deinit = mov_free, + .close = mov_close, .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE, .codec_tag = (const AVCodecTag* const []){ ff_codec_movvideo_tags, ff_codec_movaudio_tags, 0 @@ -6636,7 +6636,7 @@ AVOutputFormat ff_tgp_muxer = { .write_header = mov_write_header, .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, - .deinit = mov_free, + .close = mov_close, .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE, .codec_tag = (const AVCodecTag* const []){ codec_3gp_tags, 0 }, .check_bitstream = mov_check_bitstream, @@ -6658,7 +6658,7 @@ AVOutputFormat ff_mp4_muxer = { .write_header = mov_write_header, .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, - .deinit = mov_free, + .close = mov_close, .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE, .codec_tag = (const AVCodecTag* const []){ codec_mp4_tags, 0 }, .check_bitstream = mov_check_bitstream, @@ -6679,7 +6679,7 @@ AVOutputFormat ff_psp_muxer = { .write_header = mov_write_header, .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, - .deinit = mov_free, + .close = mov_close, .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE, .codec_tag = (const AVCodecTag* const []){ codec_mp4_tags, 0 }, .check_bitstream = mov_check_bitstream, @@ -6699,7 +6699,7 @@ AVOutputFormat ff_tg2_muxer = { .write_header = mov_write_header, .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, - .deinit = mov_free, + .close = mov_close, .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE, .codec_tag = (const AVCodecTag* const []){ codec_3gp_tags, 0 }, .check_bitstream = mov_check_bitstream, @@ -6720,7 +6720,7 @@ AVOutputFormat ff_ipod_muxer = { .write_header = mov_write_header, .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, - .deinit = mov_free, + .close = mov_close, .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE, .codec_tag = (const AVCodecTag* const []){ codec_ipod_tags, 0 }, .check_bitstream = mov_check_bitstream, @@ -6741,7 +6741,7 @@ AVOutputFormat ff_ismv_muxer = { .write_header = mov_write_header, .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, - .deinit = mov_free, + .close = mov_close, .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE, .codec_tag = (const AVCodecTag* const []){ codec_mp4_tags, codec_ism_tags, 0 }, @@ -6763,7 +6763,7 @@ AVOutputFormat ff_f4v_muxer = { .write_header = mov_write_header, .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, - .deinit = mov_free, + .close = mov_close, .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH, .codec_tag = (const AVCodecTag* const []){ codec_f4v_tags, 0 }, .check_bitstream = mov_check_bitstream, diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index fdfa544ee2..baf0099b9e 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -1819,7 +1819,7 @@ static int mpegts_write_end(AVFormatContext *s) return 0; } -static void mpegts_deinit(AVFormatContext *s) +static void mpegts_close(AVFormatContext *s) { MpegTSWrite *ts = s->priv_data; MpegTSService *service; @@ -1981,7 +1981,7 @@ AVOutputFormat ff_mpegts_muxer = { .init = mpegts_init, .write_packet = mpegts_write_packet, .write_trailer = mpegts_write_end, - .deinit = mpegts_deinit, + .close = mpegts_close, .check_bitstream = mpegts_check_bitstream, .flags = AVFMT_ALLOW_FLUSH | AVFMT_VARIABLE_FPS, .priv_class = &mpegts_muxer_class, diff --git a/libavformat/mux.c b/libavformat/mux.c index b1244c67f3..bbd558d98b 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -397,8 +397,8 @@ FF_ENABLE_DEPRECATION_WARNINGS if (s->oformat->init) { if ((ret = s->oformat->init(s)) < 0) { - if (s->oformat->deinit) - s->oformat->deinit(s); + if (s->oformat->close) + s->oformat->close(s); return ret; } return ret == 0; @@ -537,8 +537,8 @@ int avformat_write_header(AVFormatContext *s, AVDictionary **options) return streams_already_initialized; fail: - if (s->oformat->deinit) - s->oformat->deinit(s); + if (s->oformat->close) + s->oformat->close(s); return ret; } @@ -1299,8 +1299,8 @@ fail: } } - if (s->oformat->deinit) - s->oformat->deinit(s); + if (s->oformat->close) + s->oformat->close(s); s->internal->header_written = s->internal->initialized = diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index a92ff55c01..35a9ad9b52 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -1180,7 +1180,7 @@ static int nut_write_trailer(AVFormatContext *s) return 0; } -static void nut_write_deinit(AVFormatContext *s) +static void nut_write_close(AVFormatContext *s) { NUTContext *nut = s->priv_data; int i; @@ -1225,7 +1225,7 @@ AVOutputFormat ff_nut_muxer = { .write_header = nut_write_header, .write_packet = nut_write_packet, .write_trailer = nut_write_trailer, - .deinit = nut_write_deinit, + .close = nut_write_close, .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, .codec_tag = ff_nut_codec_tags, .priv_class = &class, diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index 10c4eda062..89546b6fd5 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -736,7 +736,7 @@ static int ogg_write_trailer(AVFormatContext *s) return 0; } -static void ogg_free(AVFormatContext *s) +static void ogg_close(AVFormatContext *s) { int i; @@ -781,7 +781,7 @@ AVOutputFormat ff_ogg_muxer = { .write_header = ogg_write_header, .write_packet = ogg_write_packet, .write_trailer = ogg_write_trailer, - .deinit = ogg_free, + .close = ogg_close, .flags = AVFMT_TS_NEGATIVE | AVFMT_TS_NONSTRICT | AVFMT_ALLOW_FLUSH, .priv_class = &ogg_muxer_class, }; @@ -800,7 +800,7 @@ AVOutputFormat ff_oga_muxer = { .write_header = ogg_write_header, .write_packet = ogg_write_packet, .write_trailer = ogg_write_trailer, - .deinit = ogg_free, + .close = ogg_close, .flags = AVFMT_TS_NEGATIVE | AVFMT_ALLOW_FLUSH, .priv_class = &oga_muxer_class, }; @@ -822,7 +822,7 @@ AVOutputFormat ff_ogv_muxer = { .write_header = ogg_write_header, .write_packet = ogg_write_packet, .write_trailer = ogg_write_trailer, - .deinit = ogg_free, + .close = ogg_close, .flags = AVFMT_TS_NEGATIVE | AVFMT_TS_NONSTRICT | AVFMT_ALLOW_FLUSH, .priv_class = &ogv_muxer_class, }; @@ -841,7 +841,7 @@ AVOutputFormat ff_spx_muxer = { .write_header = ogg_write_header, .write_packet = ogg_write_packet, .write_trailer = ogg_write_trailer, - .deinit = ogg_free, + .close = ogg_close, .flags = AVFMT_TS_NEGATIVE | AVFMT_ALLOW_FLUSH, .priv_class = &spx_muxer_class, }; @@ -860,7 +860,7 @@ AVOutputFormat ff_opus_muxer = { .write_header = ogg_write_header, .write_packet = ogg_write_packet, .write_trailer = ogg_write_trailer, - .deinit = ogg_free, + .close = ogg_close, .flags = AVFMT_TS_NEGATIVE | AVFMT_ALLOW_FLUSH, .priv_class = &opus_muxer_class, }; diff --git a/libavformat/segment.c b/libavformat/segment.c index 81d3f1d940..07786de824 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -629,7 +629,7 @@ static int select_reference_stream(AVFormatContext *s) return 0; } -static void seg_free(AVFormatContext *s) +static void seg_close(AVFormatContext *s) { SegmentContext *seg = s->priv_data; ff_format_io_close(seg->avf, &seg->list_pb); @@ -1074,7 +1074,7 @@ AVOutputFormat ff_segment_muxer = { .write_header = seg_write_header, .write_packet = seg_write_packet, .write_trailer = seg_write_trailer, - .deinit = seg_free, + .close = seg_close, .check_bitstream = seg_check_bitstream, .priv_class = &seg_class, }; @@ -1095,7 +1095,7 @@ AVOutputFormat ff_stream_segment_muxer = { .write_header = seg_write_header, .write_packet = seg_write_packet, .write_trailer = seg_write_trailer, - .deinit = seg_free, + .close = seg_close, .check_bitstream = seg_check_bitstream, .priv_class = &sseg_class, };