From patchwork Wed May 20 04:00:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 19779 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 2E6E744AB0A for ; Wed, 20 May 2020 07:08:29 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E65F368AA33; Wed, 20 May 2020 07:08:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A0703688187 for ; Wed, 20 May 2020 07:08:21 +0300 (EEST) Received: by mail-pj1-f68.google.com with SMTP id cx22so650117pjb.1 for ; Tue, 19 May 2020 21:08:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=hyjM3lfZw1Cy/QM27sj/MH49fo+dm2XF70LYQN4ct54=; b=cXRQToCa2DQBFuWKmnDMS7/kVjQOWo8Jgr1vpzniDJukMTaLHAVLYQqFKrQEFAB4Ik Crc0EXgnjF71gTgu+6Edj8eAopgm+KyPpH4n44rsvZh2ZF2LVLeI5EkG7FOOghW+Ew8n vFWDfMsX/356JnEOLzDUjTMIAnySVh9Fdgfi14JG3SoEGWYQKKA3R2qEu+p7FGjyrmhd EBqsT1Wzd1Z7/55LpiVp8fLCN1bUWE1jhsjt56RWzMahslzYSiRR2v48mcxsH6b82m4c xTmSXkHhyV3I7dxpk1WMvLVbuoYCm6HNiNH2rFbEsibgQBlCdf25iKNkQ5l6SKXynlh7 G4LA== 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:mime-version :content-transfer-encoding; bh=hyjM3lfZw1Cy/QM27sj/MH49fo+dm2XF70LYQN4ct54=; b=NnvmNOvcfMKkDb4Od5WmW/4u7bDI7ZUo9N5Bx0so286PiSS4RJOiJwuWMdztB9GFhD rF+MbFQ+tIvckEnqrbsWy2Nq/TA+mdDUAbJBFfzQ2IEwoXAZYQPnhISIYo2yfVgnhYnC D517uAp6GNo6ur7BIZxP2e5cGa0MAFwwIGwvm1mQJOc39K1JFpxzhrfPPRFyIBS1LAoL pk9oatC1Y7BGITD3rMPwptY4aV/dZS+YdPMQmOcm4GXA48A5IgIvL0ubZhaUjhSADqfa e04UcxWWWGxiRdLqftaqG/nQtnVG2m0rC/aXsFoUacaeOqDCmfSQf9KUaysvY+4KEppi UBvA== X-Gm-Message-State: AOAM532xyfz1hSvU2t/DbvcMzKo8TEhDPvIIMg2eIUPmfyzm2Kx5zeON ylWcH+heGbvBiZl+1m+8Yk9ak2GB X-Google-Smtp-Source: ABdhPJxEMSndVCW76k36HCbcjQZJYypurkAUTAbZf5jhqOGdxWBcwKtU6P0tT7CzL5Iu7Rp2HbPPQw== X-Received: by 2002:ad4:42a5:: with SMTP id e5mr2998153qvr.234.1589947231070; Tue, 19 May 2020 21:00:31 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.22]) by smtp.gmail.com with ESMTPSA id k25sm1230934qki.135.2020.05.19.21.00.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 21:00:30 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 20 May 2020 01:00:11 -0300 Message-Id: <20200520040011.864-1-jamrial@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/decode: remove ff_decode_bsfs_uninit() 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" It's been a wrapper for a simple av_bsf_free() call since c96904f525. Signed-off-by: James Almer --- libavcodec/decode.c | 7 +------ libavcodec/decode.h | 2 -- libavcodec/utils.c | 4 ++-- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 48a61d5419..f3327d74af 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -231,7 +231,7 @@ int ff_decode_bsfs_init(AVCodecContext *avctx) return 0; fail: - ff_decode_bsfs_uninit(avctx); + av_bsf_free(&avci->bsf); return ret; } @@ -2005,8 +2005,3 @@ void avcodec_flush_buffers(AVCodecContext *avctx) if (!avctx->refcounted_frames) av_frame_unref(avci->to_free); } - -void ff_decode_bsfs_uninit(AVCodecContext *avctx) -{ - av_bsf_free(&avctx->internal->bsf); -} diff --git a/libavcodec/decode.h b/libavcodec/decode.h index c3e0e82f4c..0d69294def 100644 --- a/libavcodec/decode.h +++ b/libavcodec/decode.h @@ -66,8 +66,6 @@ int ff_decode_get_packet(AVCodecContext *avctx, AVPacket *pkt); int ff_decode_bsfs_init(AVCodecContext *avctx); -void ff_decode_bsfs_uninit(AVCodecContext *avctx); - /** * Make sure avctx.hw_frames_ctx is set. If it's not set, the function will * try to allocate it from hw_device_ctx. If that is not possible, an error diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 91b271a717..3255679550 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1045,7 +1045,7 @@ FF_ENABLE_DEPRECATION_WARNINGS av_packet_free(&avci->last_pkt_props); av_packet_free(&avci->ds.in_pkt); - ff_decode_bsfs_uninit(avctx); + av_bsf_free(&avci->bsf); av_buffer_unref(&avci->pool); } @@ -1106,7 +1106,7 @@ av_cold int avcodec_close(AVCodecContext *avctx) avctx->hwaccel->uninit(avctx); av_freep(&avctx->internal->hwaccel_priv_data); - ff_decode_bsfs_uninit(avctx); + av_bsf_free(&avctx->internal->bsf); av_freep(&avctx->internal); }