From patchwork Thu Feb 4 19:09:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25429 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 742D944A6BE for ; Thu, 4 Feb 2021 21:16:05 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5ADAF68A9C0; Thu, 4 Feb 2021 21:16:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 668E768A912 for ; Thu, 4 Feb 2021 21:16:03 +0200 (EET) Received: by mail-qk1-f173.google.com with SMTP id r77so4419049qka.12 for ; Thu, 04 Feb 2021 11:16:03 -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=WKpfCZxDtOIAcQwby/v/ajPtTHiS+ldYFNbsLUoiQmU=; b=Q7YYelRKC4eqkQVh4cf7A1jc7e7jpy+U3K+qY0oEaFzWP58Pwd2tULfl/4x1hJsNuW OKaVpTpX+hXbPZxztJyUyLzJIp75qNRUJxMnwSIFGLe3FprWRhVH1SwhxWpv4LE2xMYf R2OSS+0T5uvzEHkPzKIJ1M3ChHen/hlgU2Q4TeDoToyIOlVmmG/ht7+NomSO/f37R86K VoSOe4P9GuPHmWNyETtDq5QvyhmGmCcfqOpHtbkqjT9Wt4w1jLX/g9BE84DmiDwdnS1q dDfiqEImqjzQ0aGm/mhmzIkiXOemNBdHzRyWqJd1t9H88CbKGfvBcQhrD42vYxyT9oi0 KD1w== 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=WKpfCZxDtOIAcQwby/v/ajPtTHiS+ldYFNbsLUoiQmU=; b=dOLSfVwsKUW5S3D+lHVUowWN4tYvtejx5xaxCdiPnWdfdm1WrlK9IAGuQ8q8ofQnzE fcTs0F1O34dmQRxNCOhuKSXZNJzzQv+CUtbmRcqPpEMgfHCmI3lzKkjP1ZcoDuVy1VRe PIXHLsHpsd+CxNtfMXqgFakQvaXB98rRmkVsrzGLAkfLvOAWakSFwGURIIT7j4OX55Qx e2k+Je64dzctf3lrIbSAIVYmNTH1iJTfb9VzZ8mqDCgge0GVRVjjdO4PpMDGwEQxPJOM kPIEwxGliZspo8FF6+gVccsB5hhrvdwpkjCic7TEwBBdM/ouLVvCnAR7OnAoHJfWhb6q PJuw== X-Gm-Message-State: AOAM533sRSSBLSyI39VpmNvojTl0l9OWfRbMtxouVz9oEkRMQkg5IXZz chwAArxMRZdsJ9K7L5MnH0bE7MkDj2g= X-Google-Smtp-Source: ABdhPJzxxiSdCKo5c7f+ZHVhQ2q0lX6VbwEzZy+10EwSkbF6vrfBIDHMzrxC3BORag8aFhRrHsp8mg== X-Received: by 2002:aed:3943:: with SMTP id l61mr1017209qte.392.1612465841968; Thu, 04 Feb 2021 11:10:41 -0800 (PST) Received: from localhost.localdomain ([181.23.64.183]) by smtp.gmail.com with ESMTPSA id t14sm5889291qkt.50.2021.02.04.11.10.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 11:10:41 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Feb 2021 16:09:20 -0300 Message-Id: <20210204191005.48190-6-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 05/50] 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);