From patchwork Mon Dec 26 21:36:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 1935 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1210507vsb; Mon, 26 Dec 2016 13:37:33 -0800 (PST) X-Received: by 10.194.124.162 with SMTP id mj2mr25174111wjb.111.1482788253486; Mon, 26 Dec 2016 13:37:33 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id xb8si47445630wjb.239.2016.12.26.13.37.31; Mon, 26 Dec 2016 13:37:33 -0800 (PST) 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 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 DF6EE689BE7; Mon, 26 Dec 2016 23:37:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 96A366899EA for ; Mon, 26 Dec 2016 23:37:19 +0200 (EET) Received: by mail-qk0-f196.google.com with SMTP id h201so26021102qke.3 for ; Mon, 26 Dec 2016 13:37:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=vxZFVFkpKYN5E56J07z1b0FepkVSAIdLA4xHRqlBmxY=; b=P9h5U5M+pqNd1mHQatLErC8lRY1wy7xhGk9VwdUAXE+IjRa6HmcmQwWFJ8bGUT6P2e pLZpXg3mX3gtJWFoVqrkM2G6mXh8CYPraqA1C1wKWPrVolLmNd6TmIeljSJ/1GWa6yyE ifOPNckqVP9RB+8c49acml+99g3iydG5KI8hfR5wfs8XXmNNE9Qpnb+8uP6q2BdBWomy F4V0GvTRniTX8wrjUlGAesT1IRYEiguCIXDcwlyCrlSyrSUEtxcSGQztsSJXGUNv7qC/ cq7UZIDIrI6rAxLJtJCDdjmkplhrcUYLjWEB84H0vIi3e0/gTaYx1bhLeAck0Q3g6uRF HFfg== 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; bh=vxZFVFkpKYN5E56J07z1b0FepkVSAIdLA4xHRqlBmxY=; b=HmP1EjPABpuR8kqfJAeOCAMYnwyTxNJt2kDLFOcr6lOxbJbKVdNaom3poMTv8ii/TW 1W5b1U+XOAjLI+G5g2byNHzI3fNTUo0aZa0oWzXEUs83oveZW2XaZf8BW+5nk2q4g9y0 GKe0RK8frsh5ihQcWh5kgwiQZkFnAXmargT0qoD04DGHug3YW5TZp/xp/9rkmdWiF+m1 Unw8Qfnb44ya1vV2nz2HnBzDkRrB51t/VuKRx0b9dvOKhPj6x89gymFVZZhtNKmNmCAN 3x1vJPxYF2NeSeYowa2tLKffYUsU99WQrQne2jqOCc2ogYp/vuqIcIk2aqa0jQscB5xK Tz1A== X-Gm-Message-State: AIkVDXI9qiLoJgyAhudy+FG3JCsV2DE+7U8giq630t1uHnswhMLXKoDb4Wx/ljfQawlB3A== X-Received: by 10.55.5.145 with SMTP id 139mr28688696qkf.77.1482788240426; Mon, 26 Dec 2016 13:37:20 -0800 (PST) Received: from localhost.localdomain ([181.22.1.238]) by smtp.gmail.com with ESMTPSA id d83sm164127qke.13.2016.12.26.13.37.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Dec 2016 13:37:20 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Dec 2016 18:36:22 -0300 Message-Id: <20161226213622.1688-1-jamrial@gmail.com> X-Mailer: git-send-email 2.10.2 Subject: [FFmpeg-devel] [PATCH] ffmpeg: use av_stream_new_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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- ffmpeg.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index ec9da3e..a1c02ca 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2916,26 +2916,17 @@ static int init_output_stream_streamcopy(OutputStream *ost) ost->st->disposition = ist->st->disposition; if (ist->st->nb_side_data) { - ost->st->side_data = av_realloc_array(NULL, ist->st->nb_side_data, - sizeof(*ist->st->side_data)); - if (!ost->st->side_data) - return AVERROR(ENOMEM); - - ost->st->nb_side_data = 0; for (i = 0; i < ist->st->nb_side_data; i++) { const AVPacketSideData *sd_src = &ist->st->side_data[i]; - AVPacketSideData *sd_dst = &ost->st->side_data[ost->st->nb_side_data]; + uint8_t *dst_data; if (ost->rotate_overridden && sd_src->type == AV_PKT_DATA_DISPLAYMATRIX) continue; - sd_dst->data = av_malloc(sd_src->size); - if (!sd_dst->data) + dst_data = av_stream_new_side_data(ost->st, sd_src->type, sd_src->size); + if (!dst_data) return AVERROR(ENOMEM); - memcpy(sd_dst->data, sd_src->data, sd_src->size); - sd_dst->size = sd_src->size; - sd_dst->type = sd_src->type; - ost->st->nb_side_data++; + memcpy(dst_data, sd_src->data, sd_src->size); } }