From patchwork Sun May 24 00:25:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19821 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 BD99644BC3C for ; Sun, 24 May 2020 03:26:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A395668A5E5; Sun, 24 May 2020 03:26:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B75C768A285 for ; Sun, 24 May 2020 03:26:26 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id h17so13861820wrc.8 for ; Sat, 23 May 2020 17:26:26 -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=FIdVeA8uMCc55kqIm0oebtGWL8UETm7HS3IPMdvXdO4=; b=XnMDVtjsFpKhNOXk0xvYG2g7uGvoH5ejzKD+dCTXsq6fqKekIpo2G6bxK30fzlL4Lt ojQ++bkNgKjX+GQGiurlR9CqTeRJ3eMyC46gQN5U1sJr43CgbV2e1H8aCdlHqSwD/OYz W4tnzrtOHuXNjyewtsI9Ha43RU8y5Gx5IXVupIQjmUPNweAhuU67LQjrhKyBBXJR5WVA 6B7jqa/bUXsWxmRTQd2jWjoSc3cgLUBn8Gw+HsAiSipvYPBtQIcwUOskT3UCtmJuiFs1 EZWsGzggaviKfx2zGNf173ugsmsQROgReemApqSsnszA0cBbL2KzSaPFyoPOsGtfxX4r OgQQ== 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=FIdVeA8uMCc55kqIm0oebtGWL8UETm7HS3IPMdvXdO4=; b=ZOe5McdsVq25y8Drot4RYIqOMyt9oyj85M1svPBhx3tUTdws4oji23/vVLG/3ms5Z6 /lhnJF4Z9Av7B2TozBncu499JjpnlsWPm585Bc0YyROh8KyvKRGRvcXkAWeB/xbnJ9Mv eusfovcFlAgJVUNyqmlEta4ohTgnEMzKpMEkRgJD4RYgpEzCfcoPnuy5S1wyR48VhAJ9 88PF/sJpOyEHHhDnoVMVP13OCtREgS4xhzPuasTVO+Ynp7wvIetJo/fhtbd2rdT9pKDj Kmmou09gS6DAfMtx0tAVBIkCc9UQx4QmeQDdlWAkiLlyVdkwRENQRHTE7PUiN+8qXF9P VDAA== X-Gm-Message-State: AOAM532veoZDx+QIG2JDYdTfZUhvkg9fchE+LhYFcefDU8YU1C4MkAOi CHRnwjheEXxGzML9j8sHXzcuGY4Y X-Google-Smtp-Source: ABdhPJwdNxMeQnwtrFzR45b6pfTw0eAvNVQ9XXEXMJnmOAujNvhi97wW4AZCHtM984VuKLV/Mziv8w== X-Received: by 2002:a5d:548c:: with SMTP id h12mr3817112wrv.120.1590279985754; Sat, 23 May 2020 17:26:25 -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.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 May 2020 17:26:25 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 May 2020 02:25:53 +0200 Message-Id: <20200524002554.28064-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200524002554.28064-1-andreas.rheinhardt@gmail.com> References: <20200524002554.28064-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avformat/img2dec: Avoid duplicating buffer 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/img2dec.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 40f3e3d499..ee7ceed08f 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -379,8 +379,7 @@ int ff_img_read_header(AVFormatContext *s1) * as a dictionary, so it can be used by filters like 'drawtext'. */ static int add_filename_as_pkt_side_data(char *filename, AVPacket *pkt) { - uint8_t* metadata; - int metadata_len; + int metadata_len, ret; AVDictionary *d = NULL; char *packed_metadata = NULL; @@ -391,13 +390,12 @@ static int add_filename_as_pkt_side_data(char *filename, AVPacket *pkt) { av_dict_free(&d); if (!packed_metadata) return AVERROR(ENOMEM); - if (!(metadata = av_packet_new_side_data(pkt, AV_PKT_DATA_STRINGS_METADATA, metadata_len))) { + ret = av_packet_add_side_data(pkt, AV_PKT_DATA_STRINGS_METADATA, + packed_metadata, metadata_len); + if (ret < 0) { av_freep(&packed_metadata); - return AVERROR(ENOMEM); + return ret; } - memcpy(metadata, packed_metadata, metadata_len); - av_freep(&packed_metadata); - return 0; }