From patchwork Thu Feb 4 19:09:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25426 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 7C4CD44A506 for ; Thu, 4 Feb 2021 21:15:05 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E8C9768A9E9; Thu, 4 Feb 2021 21:11:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 79A4D68A9A8 for ; Thu, 4 Feb 2021 21:11:35 +0200 (EET) Received: by mail-qv1-f44.google.com with SMTP id es14so2262707qvb.3 for ; Thu, 04 Feb 2021 11:11:35 -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=eMxBnMHsA7Sr+LrHM0qpNb5qtEiByT6CvKqTe9O8Wo8=; b=faotrTgEOIPbQ4yiIBjmV9lG0jVdfLDQUGE9+SqNCIC53H9KFUrAHxmC9ZtlNvTnCm oJf2FpqJ8tgd5eqGCDn5GWqcvtYliXrZSLu7hebC+Mn4xae3I+kUE6idn61F3CyISb4W WYgRGDCEyYmejkEC12S83NcOxFgRVGvcCYcA6Dh+mSyJQu5OVqXcCz9KGAX8ungsB196 kxRzdJDRQxIGUWqGhkdDbXROlZpHuYQ2QN6mWgXPuN/AZJtBEoECbYHgkCaLsbFFT7Kn DhIOY2e0BLVxGW58aiM0fwWuhLKWjKFYoVfzq6u2pJ+MA78T/Rc1GG02Y9bEGiz+y+nG m3og== 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=eMxBnMHsA7Sr+LrHM0qpNb5qtEiByT6CvKqTe9O8Wo8=; b=obN06DeE3M/7l+WQtGdGZ/ZhnuVplitmhIyjMIDd+YXBK9idhX5/a0Y33Ce8i+x2Vb HkeDyQdu7aUyMmVn4jlXoqrGL+f/v/FaIYLcL6Z9wdzMXbaSt6fyFeQ9pAJinBoi7rgp pYbxw0gzZGqYYU8/Tu4CovCcYQAD+NVdKIDZFqDgu4zrdoAEU9RB8jqSjo9SzAWLbVGs Awl3TXwbrcO0GlA2hAf6stlWPBTsyMWixLBK5QNXRemi8dp5Y/JnT5/1NlPyvv2oTmgA EtkeZiV7b5dkrFmE6Riq/G+dqMh8FreI9UpE+6jv62UCeUAr6WXBxYi3TnToKUyjYcQh tWEg== X-Gm-Message-State: AOAM533qEgOlI5IuHNCWO8lryPK5cEFcEy8Bgbniy8R8V19Hccasztvm m9CGLbTN9TS3iZZZKTY2nR6ohZum+bo= X-Google-Smtp-Source: ABdhPJyLYU7degEoMlpIX8eVeZCWsZiLppo7Gkk98QlOgid+mGOWbBZN/IPPPshNNMfDHlmhS1nm+A== X-Received: by 2002:a05:6214:913:: with SMTP id dj19mr919331qvb.33.1612465894058; Thu, 04 Feb 2021 11:11:34 -0800 (PST) Received: from localhost.localdomain ([181.23.64.183]) by smtp.gmail.com with ESMTPSA id t14sm5889291qkt.50.2021.02.04.11.11.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 11:11:33 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Feb 2021 16:09:46 -0300 Message-Id: <20210204191005.48190-32-jamrial@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204191005.48190-1-jamrial@gmail.com> References: <20210204191005.48190-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 31/50] 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..1fe582945a 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) + goto fail; /* 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;