From patchwork Sat Jun 8 09:27:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 13463 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D91704473F9 for ; Sat, 8 Jun 2019 12:29:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C59BD68AA34; Sat, 8 Jun 2019 12:29:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A165268AA22 for ; Sat, 8 Jun 2019 12:29:29 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1hZXfF-0001yL-0X for ffmpeg-devel@ffmpeg.org; Sat, 08 Jun 2019 11:29:29 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id ZXeGhwDYO5D5NZXeGhQbuV; Sat, 08 Jun 2019 11:28:28 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.41.20 X-CNFS-Analysis: v=2.3 cv=bu8y+3Si c=1 sm=1 tr=0 a=I1eytVlZLDX1BM2VTtTtSw==:117 a=I1eytVlZLDX1BM2VTtTtSw==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=ikZaO_t1aOafxW3hhbYA:9 a=FlxGOWTZKYlTwIwG:21 a=hMG2ewlQfJiKD6ez:21 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 8 Jun 2019 11:27:58 +0200 Message-Id: <20190608092801.3965-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-CMAE-Envelope: MS4wfNoKdoXPAELRJHv1lCEe0OznTaLnUpQ4RCDY9IGmyGta54mL8594wtcVRN1ROeus+66cSMffaZKKhQDb8uqWcLv5nPpkx7o6zGMhVpRSYmqFcVjSkSJz ZSP7dYiDqo7jTu2Uo0WqtcnTdkiKjBk6rT1xN5/iBhnfEpWb04rviRzS Subject: [FFmpeg-devel] [PATCH 1/4] avformat/tiertexseq: Move seq_read_close() up so it can be used for cleanup 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" Signed-off-by: Michael Niedermayer --- libavformat/tiertexseq.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libavformat/tiertexseq.c b/libavformat/tiertexseq.c index e861869ad3..a35e08ef50 100644 --- a/libavformat/tiertexseq.c +++ b/libavformat/tiertexseq.c @@ -182,6 +182,17 @@ static int seq_parse_frame_data(SeqDemuxContext *seq, AVIOContext *pb) return 0; } +static int seq_read_close(AVFormatContext *s) +{ + int i; + SeqDemuxContext *seq = s->priv_data; + + for (i = 0; i < SEQ_NUM_FRAME_BUFFERS; i++) + av_freep(&seq->frame_buffers[i].data); + + return 0; +} + static int seq_read_header(AVFormatContext *s) { int i, rc; @@ -295,17 +306,6 @@ static int seq_read_packet(AVFormatContext *s, AVPacket *pkt) return 0; } -static int seq_read_close(AVFormatContext *s) -{ - int i; - SeqDemuxContext *seq = s->priv_data; - - for (i = 0; i < SEQ_NUM_FRAME_BUFFERS; i++) - av_freep(&seq->frame_buffers[i].data); - - return 0; -} - AVInputFormat ff_tiertexseq_demuxer = { .name = "tiertexseq", .long_name = NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ"),