From patchwork Fri Mar 5 16:33:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26148 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 C868144AB0A for ; Fri, 5 Mar 2021 18:41:33 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C94A668ACE8; Fri, 5 Mar 2021 18:36:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 83D5668AB03 for ; Fri, 5 Mar 2021 18:36:05 +0200 (EET) Received: by mail-qv1-f50.google.com with SMTP id k7so1276675qvo.6 for ; Fri, 05 Mar 2021 08:36:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=MEU+wl3LEtb0dczu8GC4lxh0Gv24GvulayOJmSZ16O0=; b=abPmkh/Fz/4uvhwCNV3DTTGlPjuLPg7rYXSNZ2UB/3IExSFlY249KtI6iqH8QcU663 ea7nIH0+N1lRt+gqB4w49pVewGrURiiI3/z/bdAC7sfq0nOyL0R9tuB1CI2gt08Q1Rsr ZEaVPAF0dzF9XzpCS7k9yJQHGzvgyLLyjn1p7LEZ8h+UmY9G6zRLKMpY+QdJew1+vLFm uyPKTwaQCgeYuD9VJkHEVlPTNgBeAN7Ki0f1olIWXidq0yPDKTNXxUrYDpS93rEygGhx I+QA0vCdhwX3IT9GcdiXsd+cn/W01vP/1zSDADLPP3IRYa8EYPdGZxbtkYvstD4GNylC 60yg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=MEU+wl3LEtb0dczu8GC4lxh0Gv24GvulayOJmSZ16O0=; b=bLYj+fmn4yXmk2D0eXQKCSMhzzcXRCtTtsBEq0hPygKZ+C8JJIOQH2cEANUOfI0wLI lYuD7w0GlkdfxDvWwH/8WKdzcx3ctwBpP9u3k3hq2Zf45spBmoIVAAVxSPtsbitFu6pr qanndyqU59/oBLUV4Q5rPz0mr0WyOAIDVCEmP3gh3DHnd9Ya/XwW94rNHFGvsJyNOxbf fa1JeUY3zp+xZyaXpqyVbMs8hgPqpzm0Y06oQtGD00lgyt1vUWgw73GKI+4NewSD3/au QxRmec6IKSDF/jtFRdGiGpnaxPm43hPxuruZPESBAiabuNHk2c50tQv7RGaG2pbmgLFU 9Qnw== X-Gm-Message-State: AOAM5339eGUPqb6X1pVCxCAeD/90HTIcyQddKDSl1XZISUQ/lr4dGfmU In8dROWklozsv628gfIxELj0GkLiOI2wuA== X-Google-Smtp-Source: ABdhPJzlNSLiQfJ9hm/PSI3puiQVb5NlBxACND9L/ajje2i9lCP6EdJIIMiObOnwmzjdb445QcuIFQ== X-Received: by 2002:a0c:a404:: with SMTP id w4mr9829551qvw.22.1614962163759; Fri, 05 Mar 2021 08:36:03 -0800 (PST) Received: from localhost.localdomain ([181.23.89.132]) by smtp.gmail.com with ESMTPSA id b10sm2168494qtt.23.2021.03.05.08.36.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 08:36:03 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Mar 2021 13:33:21 -0300 Message-Id: <20210305163339.63164-31-jamrial@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210305163339.63164-1-jamrial@gmail.com> References: <20210305163339.63164-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 30/48] avformat/wc3movie: use av_packet_alloc() to allocate packets 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: James Almer --- libavformat/wc3movie.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/libavformat/wc3movie.c b/libavformat/wc3movie.c index 76e945d261..cd69931a42 100644 --- a/libavformat/wc3movie.c +++ b/libavformat/wc3movie.c @@ -69,7 +69,7 @@ typedef struct Wc3DemuxContext { int video_stream_index; int audio_stream_index; - AVPacket vpkt; + AVPacket *vpkt; } Wc3DemuxContext; @@ -77,8 +77,7 @@ static int wc3_read_close(AVFormatContext *s) { Wc3DemuxContext *wc3 = s->priv_data; - if (wc3->vpkt.size > 0) - av_packet_unref(&wc3->vpkt); + av_packet_free(&wc3->vpkt); return 0; } @@ -110,8 +109,9 @@ static int wc3_read_header(AVFormatContext *s) wc3->height = WC3_DEFAULT_HEIGHT; wc3->pts = 0; wc3->video_stream_index = wc3->audio_stream_index = 0; - av_init_packet(&wc3->vpkt); - wc3->vpkt.data = NULL; wc3->vpkt.size = 0; + wc3->vpkt = av_packet_alloc(); + if (!wc3->vpkt) + return AVERROR(ENOMEM); /* skip the first 3 32-bit numbers */ avio_skip(pb, 12); @@ -162,7 +162,7 @@ static int wc3_read_header(AVFormatContext *s) case PALT_TAG: /* one of several palettes */ avio_seek(pb, -8, SEEK_CUR); - av_append_packet(pb, &wc3->vpkt, 8 + PALETTE_SIZE); + av_append_packet(pb, wc3->vpkt, 8 + PALETTE_SIZE); break; default: @@ -248,18 +248,17 @@ static int wc3_read_packet(AVFormatContext *s, case SHOT_TAG: /* load up new palette */ avio_seek(pb, -8, SEEK_CUR); - av_append_packet(pb, &wc3->vpkt, 8 + 4); + av_append_packet(pb, wc3->vpkt, 8 + 4); break; case VGA__TAG: /* send out video chunk */ avio_seek(pb, -8, SEEK_CUR); - ret= av_append_packet(pb, &wc3->vpkt, 8 + size); + ret= av_append_packet(pb, wc3->vpkt, 8 + size); // ignore error if we have some data - if (wc3->vpkt.size > 0) + if (wc3->vpkt->size > 0) ret = 0; - *pkt = wc3->vpkt; - wc3->vpkt.data = NULL; wc3->vpkt.size = 0; + av_packet_move_ref(pkt, wc3->vpkt); pkt->stream_index = wc3->video_stream_index; pkt->pts = wc3->pts; packet_read = 1;