From patchwork Sat Apr 22 17:26:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3473 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp793164vsd; Sat, 22 Apr 2017 10:26:43 -0700 (PDT) X-Received: by 10.28.74.70 with SMTP id x67mr3363901wma.137.1492882003230; Sat, 22 Apr 2017 10:26:43 -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 z74si19556255wrb.95.2017.04.22.10.26.42; Sat, 22 Apr 2017 10:26:43 -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 BFAC868831A; Sat, 22 Apr 2017 20:26:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6BA6668831A for ; Sat, 22 Apr 2017 20:26:32 +0300 (EEST) Received: by mail-qt0-f194.google.com with SMTP id t52so15578974qtb.3 for ; Sat, 22 Apr 2017 10:26:32 -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; bh=ivPK7di3LEzzXkAvF4oCt1urs3UxmRKts4pbVezdHdw=; b=HpmyCZIQVl2CgCKWcrsw2gO7PtJLgvRx7geMhRCE46dch5PdDybfIpd1xncbVJKehQ WdWHK21nF9uNNngFjEmL0mWimLq1YULNn9BSLl3CxRPikJyDwi4xupPJnADnWPDZarOf BbV/IcsGd76CvbP81eYpKvcwLsCUhj3Y3JHMfGLctGua05DrAlLHzYLnZt+0c091SmAo gKLVGYXWVYG7L7OTq9C5TVWF54T51acQ/JK71Lp3vkRhr7aR6NB5BMUjra8XsVCBl2nO SQ8HMXDjO/P2zUhLg/V/8bPVv0RfDb3/eEqkluhvVCbvU/cW3G5aj6QUhzWXWWzDU0YR dAHA== 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; bh=ivPK7di3LEzzXkAvF4oCt1urs3UxmRKts4pbVezdHdw=; b=Q+0uaSo7gcyKtsCG8BbGwZqy35xIj2TJ3VyXbSDC6KIVUzA7WcQJLtK9EwCZXgPzpo W0LcXoCBzpjqo4Q0ahaCrXaIbuOOthIt3B9gYX/W4FCUw1BDGuLBZcUB0cqCfM85MBYS FH5Cr6KKWPQtLcH3df/Mv8idwJqBBnTUQdyMd5TivZAjXFjV5KicfwZcPikbgxU3wQDB sfcmBI6phBZuv1dZ55z3Ou3Evzo+0t5TLwwzmM/SHNm7lKf5AcBOv3CwaKLxXN3ORZKk 4x0LLcQlmHpFbZCVmjMF1Rm7RQFV7CCE+acYUN1jAf4Q5t2khp72PQ8pu5S+Pz4topJr xOpA== X-Gm-Message-State: AN3rC/4cnLqTYfQ2ERmcxRhhrLL85atYkmR0tkkBgrbuVa0DNra9d9qh 3c/x+WTRK8j4ll2x X-Received: by 10.200.47.2 with SMTP id j2mr18296123qta.277.1492881991142; Sat, 22 Apr 2017 10:26:31 -0700 (PDT) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id n5sm8954460qkb.39.2017.04.22.10.26.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 22 Apr 2017 10:26:30 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Apr 2017 14:26:08 -0300 Message-Id: <20170422172609.5292-1-jamrial@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170422161538.GV4714@nb4> References: <20170422161538.GV4714@nb4> Subject: [FFmpeg-devel] [PATCH 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 --- 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