From patchwork Mon Jun 15 00:01:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20380 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 BCA1E448DD8 for ; Mon, 15 Jun 2020 03:02:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A629168B6B1; Mon, 15 Jun 2020 03:02:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A100168B694 for ; Mon, 15 Jun 2020 03:02:39 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id x13so15262985wrv.4 for ; Sun, 14 Jun 2020 17:02:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QBfQh0OYynOo8sCizrwMqst8fh2pLT1lFaH0K5X43Rg=; b=JDP8LBMlh9AyIfwhLe1Qf0hunOmOniymGYwfgeqoy32bbJyE0/3wPhJLBFK3lhA5X1 mpdvqzI2QKWPjX5g+L1gnjxtbcrjrFtE+gQoMijPBvS7zIJEv1Cg0BgoLivylbMDGv6P 2/PWIyaflkcGpUj2DFwSuOHcGWT50FxR8PKJKjScW0DnWN2vmXM7twhLYWEEJB04y9SI /sgheWQter0DFH78MHaGC1oVTyf+EfHeV3VorCOg6+GEm702rQbH5sSiwrFppDV6h7sp Bh+7bZx1FMXKH29hRQjHrPAoCfM6AqB8faDztJM4BXA+/J1E1rx2Dhrej/tEqmNUeIJW l4jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QBfQh0OYynOo8sCizrwMqst8fh2pLT1lFaH0K5X43Rg=; b=eXTLRHtbh7gjZAqqRAE089VciANa/JsEY4WrkdQTPSufapzpQvfcjFthsLpLnYhSqS 5Cg17caauo4kpVVCOpVOGoEdMYipZrouuu+3B9Qt2QPFVR++CjIy++llSyL/7+MQdG9A efC3N7jrTTnMtRx7WyEVhF8KVnj3p3JVTZ67Jt1exiBKZ7+Rte2kd1m5J5yydgY33C+X b5Akt8lyxpEo1PIwhnc0jTqD1EeeujzOaw4lcfFTSmKgbfLYQLJEDr+Zs+7f3IyboP3w ZcPtqrD26FyuLPdi93T/imyFWt2oNh2t1KdorrCU/GeQGASG8zWChAZL/ppm34WJic96 zjag== X-Gm-Message-State: AOAM53312X2tvSpflDIQbeTfhQeJagDlc/vrv8bkm466JRUNkfRV2BN4 mjuEx+0B1lplHJLvUPm46nONI9Xz X-Google-Smtp-Source: ABdhPJwVvlCBEYkLklK6HyGN50trylOANkvNhP1D6iVe6YvpbwqCjEq/LnYLAmV3jAN3Hglw0AssHg== X-Received: by 2002:a5d:4e03:: with SMTP id p3mr26523385wrt.350.1592179358904; Sun, 14 Jun 2020 17:02:38 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id 5sm29512167wrr.5.2020.06.14.17.02.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2020 17:02:38 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Jun 2020 02:01:58 +0200 Message-Id: <20200615000204.10568-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200614223656.21338-1-andreas.rheinhardt@gmail.com> References: <20200614223656.21338-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 29/35] avformat/mov: Avoid allocation+copy when moving extradata 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/mov.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 72e868527a..7c8c9bcb51 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2545,11 +2545,8 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries) /* Move the current stream extradata to the stream context one. */ sc->extradata_size[pseudo_stream_id] = extra_size; - sc->extradata[pseudo_stream_id] = av_malloc(extra_size + AV_INPUT_BUFFER_PADDING_SIZE); - if (!sc->extradata[pseudo_stream_id]) - return AVERROR(ENOMEM); - memcpy(sc->extradata[pseudo_stream_id], st->codecpar->extradata, extra_size); - av_freep(&st->codecpar->extradata); + sc->extradata[pseudo_stream_id] = st->codecpar->extradata; + st->codecpar->extradata = NULL; st->codecpar->extradata_size = 0; } sc->stsd_count++;