From patchwork Sun May 24 00:25:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19819 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 D6F9444BC3C for ; Sun, 24 May 2020 03:26:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A9B7E688121; Sun, 24 May 2020 03:26:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 75A9F687F22 for ; Sun, 24 May 2020 03:26:08 +0300 (EEST) Received: by mail-wr1-f50.google.com with SMTP id x14so8514246wrp.2 for ; Sat, 23 May 2020 17:26:08 -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:mime-version :content-transfer-encoding; bh=ETFhddBUjpCbsawTP8tz85IVilABk+gjgMhOWvzUaIk=; b=rj//HcuIw1aRrMt7ZaB9ZO1fKG1pt519vNaHea7RiiiAsFO/CqRcvHBBBLGxGa36sK BluvDD/5B0J9JSMkKVp85c7wgbC889TtgL7KrJwNDp8dBWkM1QXykyrHG/ROwOX8Zm+p Z4gaquPL9PSlAjkVHZr4TFewa7j7Ga69XJLUmpW4k6vY7m2BOfEf5d1r/z7P6UpNiSpM 6EC9E97ja5hPj71CZBxVe1HD1W347HiRoVqGWqHcNvEk2KQjJlRapBstk/mtyXKg2aV2 BWX2/+z3785OmThlv4TfH/bSYgRM7zp3+HNjXrMVsEUVtkEMrgwUU2Eq8xPhgHeLECy2 Z67g== 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:mime-version :content-transfer-encoding; bh=ETFhddBUjpCbsawTP8tz85IVilABk+gjgMhOWvzUaIk=; b=ZmtqmCKLQQqeN0PSvWvUvt/cwrfxYMiE3bmrTS675wj30xjDg9GUX6Yn9cu/FeUe9t YFNc35/5L7ZI25n/iDLAUis7wTeD0KBchkDh9UeUkBOs7YBephsjyy0GzWh+j0uNISgx pXrdK2rCoI0uJlvYNWxmFxtLxT8emB3VCRk/pjurm0EFmGz5dvBAnYK1jJ7Heau3RPxT cfE7n/wTxVQXEbZzA5OOAoF+k2FwAEZW7jBAfjtb/xGycBEjZlSYm2podO0rz+X8NZSP 6tRnOpq2ecZSg3Drw0iWML1Dm9Xx/8OAaDeTbqEosgZ643/qgXqrdPHz9N16dpkXBq7C eh8Q== X-Gm-Message-State: AOAM532GSxmG/pRD3wq017QwWH1vfA5oKFzZV8i8Odm1t3dMJRzzTyO+ B893cCD7KCBlu8F+vKjFBSksVMVe X-Google-Smtp-Source: ABdhPJzLGjVEDQ/CyTh8mwlTnQC3E7kh6aQzfKSUFq1Vqo8M3MBvt12sTl4R6Obd6k/c/0iCRCvuMw== X-Received: by 2002:adf:e545:: with SMTP id z5mr3293930wrm.89.1590279967580; Sat, 23 May 2020 17:26:07 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id l204sm3722158wmf.19.2020.05.23.17.26.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 May 2020 17:26:06 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 May 2020 02:25:51 +0200 Message-Id: <20200524002554.28064-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avformat/flvdec: Avoid duplicating extradata when adding side-data 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/flvdec.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 7c3e5b06c6..957acedf39 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -1283,12 +1283,11 @@ retry_duration: pkt->stream_index = st->index; pkt->pos = pos; if (flv->new_extradata[stream_type]) { - uint8_t *side = av_packet_new_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, - flv->new_extradata_size[stream_type]); - if (side) { - memcpy(side, flv->new_extradata[stream_type], - flv->new_extradata_size[stream_type]); - av_freep(&flv->new_extradata[stream_type]); + int ret = av_packet_add_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, + flv->new_extradata[stream_type], + flv->new_extradata_size[stream_type]); + if (ret >= 0) { + flv->new_extradata[stream_type] = NULL; flv->new_extradata_size[stream_type] = 0; } }