From patchwork Tue Jul 28 22:50:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 21349 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 4290F44B063 for ; Wed, 29 Jul 2020 01:53:11 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2BF4968BA01; Wed, 29 Jul 2020 01:53:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7778368B9F3 for ; Wed, 29 Jul 2020 01:53:02 +0300 (EEST) Received: by mail-wr1-f50.google.com with SMTP id f7so19810776wrw.1 for ; Tue, 28 Jul 2020 15:53:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=9HKRz4RO/DQkYDCyAADTb5WNhkklD/1+Ibo8eohwj/E=; b=nWqIkDphQ7DqAf9CMhZ2gwY6dHUSs5kLgQDn43uqWplE4p6GbttkZpu9JDXXKQ3YHI 8ywPOleFcLtrHdrTrkbdwXNKB1SMtr5lzJFpZO5K3rpjUFZKUtq8y/a3nGlpmjZ2Qjpr ZQWgMbWLvSY/vOk2qiL5IWPXWNfT/zPCIpF3jtV0Fguai564TkQwEcPUg/yoLhrQq6gg a+KA0PCzy5uBjElRt5QaLkP/7qsMY60ehEj6OGYkhB/WYr5jA6sUkYRRmSEoL+tVtn3H mt3ITAvIRRdQvmQpMgu1RI9dOh3A1V0NaHaz5DG2xeqiU3NBxhodJWMNkoz9aklZfjJJ uucg== 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=9HKRz4RO/DQkYDCyAADTb5WNhkklD/1+Ibo8eohwj/E=; b=soBrPZJu/7x7ejnzP0y6v/wa7ON5HISXGFXMunocNwmPVkPIPwOC/BA9yhkjlqgnst EYfig9MtaZsub7q4cAg4GnYawp12mtCxzjx2FRMLL6pjXLbCkZCznLwCTwcxLkd7Jeon xMVJ3JIEa+u1oYxuuxuofimhxcE1D5dZgVW/0VWUJW+EFogueLfzR6mFjjQ1fxsxoHvN IHn9ZqTpXuZDDEVALRs/oocs3jOXAPfH0AL5baJeVJRqg0t0yRhHN97Nbz0WFK98nDkS 3sPCmoztLkvA7s6mD7rzl+yUHcyZh+tMd68texzWzNZPUD7Z6ty5ft5U5lrBcfxoL+kj MF6w== X-Gm-Message-State: AOAM532UeBC7cLmZK3Y5x/zSef52UC+69kfTJ7TyXGISf7I+kN7hj1ED NgPYaTWAjbw5SEiPUrq90q5EBOVE/pc= X-Google-Smtp-Source: ABdhPJxWYvaVlN7qdgHS0stRQshJWsWU524CIKpS7K8U2l+amPeDRQSrWL9lGVELlUAmw4ADez7MXA== X-Received: by 2002:a5d:67d2:: with SMTP id n18mr26289306wrw.214.1595976781543; Tue, 28 Jul 2020 15:53:01 -0700 (PDT) Received: from localhost.localdomain (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id 5sm629197wmk.9.2020.07.28.15.53.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jul 2020 15:53:01 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Jul 2020 23:50:23 +0100 Message-Id: <20200728225025.1830283-4-sw@jkqxz.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200728225025.1830283-1-sw@jkqxz.net> References: <20200728225025.1830283-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/6] vaapi_encode: Delete unused field 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" --- libavcodec/vaapi_encode.c | 12 ++++-------- libavcodec/vaapi_encode.h | 1 - 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 4544090bcc..b3a02459f1 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -607,11 +607,9 @@ fail_with_picture: fail: for(i = 0; i < pic->nb_param_buffers; i++) vaDestroyBuffer(ctx->hwctx->display, pic->param_buffers[i]); - for (i = 0; i < pic->nb_slices; i++) { - if (pic->slices) { - av_freep(&pic->slices[i].priv_data); + if (pic->slices) { + for (i = 0; i < pic->nb_slices; i++) av_freep(&pic->slices[i].codec_slice_params); - } } fail_at_end: av_freep(&pic->codec_picture_params); @@ -742,11 +740,9 @@ static int vaapi_encode_free(AVCodecContext *avctx, if (pic->encode_issued) vaapi_encode_discard(avctx, pic); - for (i = 0; i < pic->nb_slices; i++) { - if (pic->slices) { - av_freep(&pic->slices[i].priv_data); + if (pic->slices) { + for (i = 0; i < pic->nb_slices; i++) av_freep(&pic->slices[i].codec_slice_params); - } } av_freep(&pic->codec_picture_params); diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h index 2d71eb0199..aa2a45bca6 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -64,7 +64,6 @@ typedef struct VAAPIEncodeSlice { int row_size; int block_start; int block_size; - void *priv_data; void *codec_slice_params; } VAAPIEncodeSlice;