From patchwork Tue Dec 10 01:41:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16691 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 5404044882F for ; Tue, 10 Dec 2019 03:42:28 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2BEC1687FD6; Tue, 10 Dec 2019 03:42:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 257F968B6D0 for ; Tue, 10 Dec 2019 03:42:27 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id g206so1393879wme.1 for ; Mon, 09 Dec 2019 17:42:26 -0800 (PST) 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=NR5mmC1xVjJyaWNG66sQ6joSCkvaVDVOcD9CCAucOFk=; b=SSAdNMie9IAxLh4S3cM23EhzeS3H6kxVuuZnme/nKe5bzIKI1w1TPA7Vl4EvtbUQaf oIpzIBPHxU3b6UL3tND2qOk7xvmYY6HwkXV3VzXG5g2OVEYjvtmJszesMKJDqlxWHIZ7 CX/p2TlBnkQvl+7hk+2ajJbt7Uc9HPU5tHdwHkZgwTpXGTcesCz+7ERDQuYjNf/bRbkT mZ0e7jsQz6rEYEtPY5UjqTK18omMdqgFjy8XeTYejSyJQA2fzVhrOuTrX/IHsfvKEKp8 DDyntuCbvkgl0bnR4lvHvIVPB9LTf6hk/Dn/LkbOBySI1qJQd525qsxwUeZlXk+SwuYY 72WA== 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=NR5mmC1xVjJyaWNG66sQ6joSCkvaVDVOcD9CCAucOFk=; b=X8wJrjmZ/H2vCZ0eEBt9nnWKpwsT4KKgnyBT3ZurVoBXnosu0J03r6zgX7cSHkEPuY XPMckQgodGkkr6XAlgkq5uVgxZdlgHZ5Lp/8mkriBAaMi1Nu4k39TgqIumo9xPAssXfW +Yu+mYfACTXVZRxVIz7VP2uzhRpAoaK/GlAoz7BgEi4VRhPwaI0t+a69aTGUrrUDEKAe dCCFLDFUqsx0sNWIW5PM+s38kkM8y3XNjXl/nu4PEL/tS/6dI7SubMTXROFsqF7VIkmk Al9DAlMXbpuDNSUEPV79eUlL+5hpLYxAXXM2cKn4YNAniEQ11Tz/DGMxvB0BsrbILKut Bn/Q== X-Gm-Message-State: APjAAAXE0hqGzALX63p3lt72qS1E8WuDRoolvXvEMHzFOBX0Fn1d9ZdB d/eLa9YjM05cHC079ZNQWO+Bna/H X-Google-Smtp-Source: APXvYqwNuLdY3v5uDmjDqDrNWnW113U26Ya8bYMuE/NE3wlYY/ZrxL52rZ5oEmy7zyUaIpPVuEOTQg== X-Received: by 2002:a7b:c01a:: with SMTP id c26mr1977536wmb.160.1575942146422; Mon, 09 Dec 2019 17:42:26 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id q15sm1440592wrr.11.2019.12.09.17.42.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2019 17:42:25 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Dec 2019 02:41:44 +0100 Message-Id: <20191210014145.3297-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210014145.3297-1-andreas.rheinhardt@gmail.com> References: <20191210014145.3297-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avformat/flvenc: Don't reimplement ff_alloc_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/flvenc.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 872050a74f..862082dd2d 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -908,14 +908,10 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) int side_size = 0; uint8_t *side = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, &side_size); if (side && side_size > 0 && (side_size != par->extradata_size || memcmp(side, par->extradata, side_size))) { - av_free(par->extradata); - par->extradata = av_mallocz(side_size + AV_INPUT_BUFFER_PADDING_SIZE); - if (!par->extradata) { - par->extradata_size = 0; - return AVERROR(ENOMEM); - } + ret = ff_alloc_extradata(par, side_size); + if (ret < 0) + return ret; memcpy(par->extradata, side, side_size); - par->extradata_size = side_size; flv_write_codec_header(s, par, pkt->dts); } }