From patchwork Fri Mar 5 16:32:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26121 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 9FBD044B9E2 for ; Fri, 5 Mar 2021 18:35:42 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8294668AAC1; Fri, 5 Mar 2021 18:35:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C57EB68AA2A for ; Fri, 5 Mar 2021 18:35:33 +0200 (EET) Received: by mail-qk1-f172.google.com with SMTP id f124so2550327qkj.5 for ; Fri, 05 Mar 2021 08:35:33 -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=yd2rh/Xu/+D6Bkm1/8f2oUZwVVjkT/rfijYOe6IX8kw=; b=NYwbAGhia//g6RQON3SgZyPqcBznXwel//bbzg6YmTIJBJ7r2Dy5NmjeiGEeWSbTAK Osr0Jl3i4svwir5ipE5HQVttwXhNjYwtkD3VJCKGDb6rasrkSwP6sCR/Q54XsX2gRPEI JiBQQAAWw8aE++E8bfsMdgKQFZm0lZf1h6HzV2CqaG0Kwa5c+1gN6yb7rcA3p8KfLqik Toqb99YhghqhF7qWRgZ9JoGjKtw8mlUQDPC1NEXYsW9rLd2yA15Bjy9oNO/HTya3lxL0 LXSdigR1LjZeJKfqfDMOzYPG/lwszcw9odqBmCHdYT4QKct/2tetw7Q2gUBPPzLX2GjH weZw== 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=yd2rh/Xu/+D6Bkm1/8f2oUZwVVjkT/rfijYOe6IX8kw=; b=kPu8tJGvQ/krQzAQ8PVzmG21AfoclrnGr+V19t3GLU0WnLhh5fC/Q9m53nfgg+r3CS 0c7AWa6flXsla62IIbFbpske9juVGPbPP7uZ8bmT5I+oa1DVox69vE+ebQXWwlWz6wBq kHTUOPfTeDyHzW0cNwFnxhcZkxPG6ZEdKUPT7rct2lspzzuBunkfJKfG+gH1kSfxHOiv Mhr7cCBZuS2P4lQt/qbb0s/KbxSHDpnKL9uvHDY4Y+DvCHKLF6pAxOML6gXTlTCZKuhh qdfdg7BDFSj+Ra32lw9eI9h+jCRoS8ZvAqmRpz16FGwMCQUkx9koVaAoeXcjWEhnsKBx w/UA== X-Gm-Message-State: AOAM530AYUKnlwKV+y65U1CiCaIqxMp/Nw/QTq1Ig+0ZWdhaKmEf+hkW vwHLvuUfat/FlmCftt68dKvvqIJDjtnb5A== X-Google-Smtp-Source: ABdhPJwYSmKYOMwdBZp6Y/mJqwis5qvmg/wxXhyhdsWKMnrjFj204+a4efM665o1F8OZfkyLj1a/PQ== X-Received: by 2002:a05:620a:b02:: with SMTP id t2mr10100329qkg.128.1614962132235; Fri, 05 Mar 2021 08:35:32 -0800 (PST) Received: from localhost.localdomain ([181.23.89.132]) by smtp.gmail.com with ESMTPSA id b10sm2168494qtt.23.2021.03.05.08.35.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 08:35:31 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Mar 2021 13:32:56 -0300 Message-Id: <20210305163339.63164-6-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 05/48] avcodec/libxvid: 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 --- libavcodec/libxvid.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index 857077dc3b..d880558893 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -685,10 +685,12 @@ FF_ENABLE_DEPRECATION_WARNINGS /* Encode a dummy frame to get the extradata immediately */ if (x->quicktime_format) { AVFrame *picture; - AVPacket packet = {0}; + AVPacket *packet; int size, got_packet, ret; - av_init_packet(&packet); + packet = av_packet_alloc(); + if (!packet) + return AVERROR(ENOMEM); picture = av_frame_alloc(); if (!picture) @@ -696,6 +698,7 @@ FF_ENABLE_DEPRECATION_WARNINGS xerr = xvid_encore(NULL, XVID_ENC_CREATE, &xvid_enc_create, NULL); if( xerr ) { + av_packet_free(&packet); av_frame_free(&picture); av_log(avctx, AV_LOG_ERROR, "Xvid: Could not create encoder reference\n"); return AVERROR_EXTERNAL; @@ -704,6 +707,7 @@ FF_ENABLE_DEPRECATION_WARNINGS size = ((avctx->width + 1) & ~1) * ((avctx->height + 1) & ~1); picture->data[0] = av_malloc(size + size / 2); if (!picture->data[0]) { + av_packet_free(&packet); av_frame_free(&picture); return AVERROR(ENOMEM); } @@ -711,9 +715,8 @@ FF_ENABLE_DEPRECATION_WARNINGS picture->data[2] = picture->data[1] + size / 4; memset(picture->data[0], 0, size); memset(picture->data[1], 128, size / 2); - ret = xvid_encode_frame(avctx, &packet, picture, &got_packet); - if (!ret && got_packet) - av_packet_unref(&packet); + ret = xvid_encode_frame(avctx, packet, picture, &got_packet); + av_packet_free(&packet); av_free(picture->data[0]); av_frame_free(&picture); xvid_encore(x->encoder_handle, XVID_ENC_DESTROY, NULL, NULL);