From patchwork Mon Apr 24 22:47:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3484 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp1650929vsd; Mon, 24 Apr 2017 15:48:33 -0700 (PDT) X-Received: by 10.223.160.59 with SMTP id k56mr8538107wrk.0.1493074112980; Mon, 24 Apr 2017 15:48:32 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 89si27708404wrk.321.2017.04.24.15.48.32; Mon, 24 Apr 2017 15:48:32 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1211168995B; Tue, 25 Apr 2017 01:48:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f193.google.com (mail-qt0-f193.google.com [209.85.216.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C732D6898B1 for ; Tue, 25 Apr 2017 01:48:21 +0300 (EEST) Received: by mail-qt0-f193.google.com with SMTP id c45so22704689qtb.0 for ; Mon, 24 Apr 2017 15:48:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=1OJgGYurRY7jA5LLrjeblsvcXCqi8bCuhB93nLOxlWk=; b=Pr7FuPaqy514XT38wI8MIxB6lA7rliqmx/CTmrPW0HoS3hINz78Lan7cQuo30I9tTC 6ws18x02Yza5F6h3Rr7upxU1vgTSWnvQRu59XI6ukftctJOLPECkLDddtPzQJY9PkAQu BdsvyjGQ2jAV8DkKQ2wVGGTzC+ed//d8Ntu9hN1qRvhoImQwuLidZ6tvImFU4GmVYxDZ 1ozVlL0uOSQ1xznbeWVS8scB5yIEVR/JRcg4Gwv+cfMiLFscb2QqytvAKEETG9s5/KE5 jLDOXnc+pyedWsrTtghlJg7Xzcn0nfnOfjAPmEz6UoP2AxHbhRDNMXbr5srA6iupT7z8 prpA== 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; bh=1OJgGYurRY7jA5LLrjeblsvcXCqi8bCuhB93nLOxlWk=; b=Jew/MdmgpyGt1K6jr0jX7EWpVeTHOHG4JYr3AsZuBY6dbOJdFj1feb99w9AYu75FtL s36Ic8010qay5ymdHPw+pCt+nvJj59YKIaICbu10Lk96gFPU+oqmyOmGE6awz1Jx1uqH ioRw2F3i+GtLUjWuyMaw8dpW4KlDXgenzQ4va6Q9d6gKE2wqeP/VZ2DfyXT7Mz9srMr4 54juVqof7kTl2F9KcPKTPV0IdP9oprC7Jqqcj/4tERpBpsrYsCYS7dxF3b5dX1+Eet1I J0GjiGxJcMqejvzR31ayuNm/kv5+D4EzVTxmhaA6TDPmb7zLEdRFeI3UX2qjZn2/AYo1 +5cg== X-Gm-Message-State: AN3rC/5jo47ISVoLKPPkTlLhqgmG0q/ear3HKS3HFZn+0HtsluNcNf5x c9U3frtFMWgjWuOM X-Received: by 10.200.37.16 with SMTP id 16mr30445664qtm.293.1493074101665; Mon, 24 Apr 2017 15:48:21 -0700 (PDT) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id a2sm13867557qte.64.2017.04.24.15.48.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 24 Apr 2017 15:48:20 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Apr 2017 19:47:45 -0300 Message-Id: <20170424224746.2172-1-jamrial@gmail.com> X-Mailer: git-send-email 2.12.1 Subject: [FFmpeg-devel] [PATCH v2 1/2] avcodec/options: factorize avcodec_copy_context() cleanup code 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- No changes since last version. libavcodec/options.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libavcodec/options.c b/libavcodec/options.c index 7bdb0be5af..b98da9378a 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -188,6 +188,19 @@ void avcodec_free_context(AVCodecContext **pavctx) } #if FF_API_COPY_CONTEXT +static void copy_context_reset(AVCodecContext *avctx) +{ + av_opt_free(avctx); + av_freep(&avctx->rc_override); + av_freep(&avctx->intra_matrix); + av_freep(&avctx->inter_matrix); + av_freep(&avctx->extradata); + av_freep(&avctx->subtitle_header); + av_buffer_unref(&avctx->hw_frames_ctx); + avctx->subtitle_header_size = 0; + avctx->extradata_size = 0; +} + int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src) { const AVCodec *orig_codec = dest->codec; @@ -200,12 +213,7 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src) return AVERROR(EINVAL); } - av_opt_free(dest); - av_freep(&dest->rc_override); - av_freep(&dest->intra_matrix); - av_freep(&dest->inter_matrix); - av_freep(&dest->extradata); - av_freep(&dest->subtitle_header); + copy_context_reset(dest); memcpy(dest, src, sizeof(*dest)); av_opt_copy(dest, src); @@ -264,15 +272,7 @@ FF_ENABLE_DEPRECATION_WARNINGS return 0; fail: - av_freep(&dest->subtitle_header); - av_freep(&dest->rc_override); - av_freep(&dest->intra_matrix); - av_freep(&dest->inter_matrix); - av_freep(&dest->extradata); - av_buffer_unref(&dest->hw_frames_ctx); - dest->subtitle_header_size = 0; - dest->extradata_size = 0; - av_opt_free(dest); + copy_context_reset(dest); return AVERROR(ENOMEM); } #endif