From patchwork Mon Aug 10 18:06:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 21591 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 8941A44AD49 for ; Mon, 10 Aug 2020 21:07:07 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6C2D368ABD5; Mon, 10 Aug 2020 21:07:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C341688162 for ; Mon, 10 Aug 2020 21:07:00 +0300 (EEST) Received: by mail-qt1-f196.google.com with SMTP id c12so7467034qtn.9 for ; Mon, 10 Aug 2020 11:07:00 -0700 (PDT) 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=tg5r9c/cEOUISRwFPEM4cW/85V9qlmeOx0PC7NOzAN4=; b=A2Cd4oNuJ1dCM5vp/8/EGy2tofuYzxvDlev+DekeF12CikwVxlmKIQL++My1mVBanC otyXE4qEMBeuqHkEJu00toizGlOhPH7fJ5IiS934JElH7R6BU8I59vsgl1oeUs4AGwEf AaG4CjJfuQDVq4Z23BK1niTa+8rhjZtvwI+DTynX/ymD8kJVqoOOm8sqM03TbVpLawXk Skb1DAXP9sBCZXwm+nMp0STMUO/jaM4FmmwhoeP2/KqU1j34H5RQhhaS1zwi4pOEcaLi em9+rwg+yOXeJeOP+ZhtZuU5i43Cfe4Zo/tGKKU9yQdMR2phws8c/fGPVAw3ecFRm+/l 8zPA== 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=tg5r9c/cEOUISRwFPEM4cW/85V9qlmeOx0PC7NOzAN4=; b=msivQ3D/lEwY+pk2bTB879FsU5QV3bPK5XeNAv0v3mHCVL/bJVotyQPCKEqggvfN0Z DrYJCJ3vbcJSQ6rVudavp/wDTqT5fqyy/3R4E8PBp4ep8v30eTAh0PcoDBlcBGzfuLli zkDgcOEPit2CjgVo6zEPfbxHev64lDD2X6nCiq2HKAPGKVulzLYpaePY2XUufz3UnpyL DaOLQUcERrLdOmXonzW2g1AMgJXsmFmVPs52/DB017WmCl0paDqQbxLjBv+ers7q4czg B6h4maFn6crIvygTHuf3hpDEcFXhVhwlLbMKux9OAzTD4j8Ahb+YZTsYaXmrCaYgnvD2 RHOA== X-Gm-Message-State: AOAM533UVu+f8giWIF8sh8KEAeBoadIAuLdXUHs66io0+97MOhq+ogmj q+dOTYeKrFowAZUvrpT8m3M7+Yar X-Google-Smtp-Source: ABdhPJxDAEK3I87xWlIuniZwFlD//74hiXNVCz4DmbZ6HXQhu9jgJUfwdWUykDGuTT7guwcZS5A1Pw== X-Received: by 2002:ac8:581:: with SMTP id a1mr28470203qth.247.1597082818639; Mon, 10 Aug 2020 11:06:58 -0700 (PDT) Received: from localhost.localdomain ([181.23.72.45]) by smtp.gmail.com with ESMTPSA id t12sm14568707qkt.56.2020.08.10.11.06.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Aug 2020 11:06:57 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Aug 2020 15:06:14 -0300 Message-Id: <20200810180615.5222-2-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200810180615.5222-1-jamrial@gmail.com> References: <20200810180615.5222-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/utils: make codec_parameters_reset() a shared function 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 will be useful in the next commit. Signed-off-by: James Almer --- libavcodec/internal.h | 2 ++ libavcodec/utils.c | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 0a1c0a17ec..a302cb24eb 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -413,6 +413,8 @@ int ff_int_from_list_or_default(void *ctx, const char * val_name, int val, void ff_dvdsub_parse_palette(uint32_t *palette, const char *p); +void ff_codec_parameters_reset(AVCodecParameters *par); + #if defined(_WIN32) && CONFIG_SHARED && !defined(BUILDING_avcodec) # define av_export_avcodec __declspec(dllimport) #else diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 5a2a90b030..3fda7c51d7 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2031,7 +2031,7 @@ AVCPBProperties *ff_add_cpb_side_data(AVCodecContext *avctx) return props; } -static void codec_parameters_reset(AVCodecParameters *par) +void ff_codec_parameters_reset(AVCodecParameters *par) { av_freep(&par->extradata); @@ -2057,7 +2057,7 @@ AVCodecParameters *avcodec_parameters_alloc(void) if (!par) return NULL; - codec_parameters_reset(par); + ff_codec_parameters_reset(par); return par; } @@ -2067,14 +2067,14 @@ void avcodec_parameters_free(AVCodecParameters **ppar) if (!par) return; - codec_parameters_reset(par); + ff_codec_parameters_reset(par); av_freep(ppar); } int avcodec_parameters_copy(AVCodecParameters *dst, const AVCodecParameters *src) { - codec_parameters_reset(dst); + ff_codec_parameters_reset(dst); memcpy(dst, src, sizeof(*dst)); dst->extradata = NULL; @@ -2093,7 +2093,7 @@ int avcodec_parameters_copy(AVCodecParameters *dst, const AVCodecParameters *src int avcodec_parameters_from_context(AVCodecParameters *par, const AVCodecContext *codec) { - codec_parameters_reset(par); + ff_codec_parameters_reset(par); par->codec_type = codec->codec_type; par->codec_id = codec->codec_id;