From patchwork Thu Nov 17 05:41:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 1453 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp581030vsb; Wed, 16 Nov 2016 21:42:24 -0800 (PST) X-Received: by 10.28.6.203 with SMTP id 194mr1825575wmg.16.1479361344616; Wed, 16 Nov 2016 21:42:24 -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 jo3si1216131wjc.34.2016.11.16.21.42.24; Wed, 16 Nov 2016 21:42:24 -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 EA0CD689E3F; Thu, 17 Nov 2016 07:42:12 +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 822A5689950 for ; Thu, 17 Nov 2016 07:42:05 +0200 (EET) Received: by mail-qk0-f196.google.com with SMTP id n204so24630988qke.2 for ; Wed, 16 Nov 2016 21:42:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=3ujir0wR3DrDkxYdKeso6rqSLQEWnYYGBe4TNvzm9Mc=; b=XHTbqr7fvyh0DYYA+j4y/sGupYu4RWEyOa1YptS5TO0jk5bVziHd1z+pf6T/45vdvf g2LkzOx8b9WciXOzi/iztuiGXpmHL3QYpizmxRsfmEc+65+rcfKjyZH62MIsV9AAi66k E9IFCMRJlBRH6czEEFrtgEBHp9569vb/7mk4S+o3BgL1AGm/DK3UuuVmyRUzMGBjteuy L3l5BQyNtBX3/nZyEFnZSowvFKVpiGphUBkuFg0cbkZB9FDecQXgnSscjf819Ev7Avzl ylNDYYSGTk6uRnmytTPx3fhgK8DoZFrBDg137f5CiFsqA+39HT90wIOzOMWrVJDeEzMV IQWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=3ujir0wR3DrDkxYdKeso6rqSLQEWnYYGBe4TNvzm9Mc=; b=Eyt/SnfYDvtr/Lo9odrqoo6JNI848xK4x03iay93uvinD0p/yiUy82py0c60MLd4wn HJOP65w/k/k8eHJNo1W0tv/VJFbMff0A/0vCh+5Dz93kKx0hsEbowJirJ08nMFs/51sq 44eSBMYPvOlej9X1Y2WKAayY0s3O83TiDqvNj9MEHSbMxTZ/GxVu+iCEMZSm1OcEaCqz v5sH357LRZmenNgTL7fi669WSYjWGJ1qMf0CCXGusM4hdhrNcAfS3dn5/36EIL9pHJAI /aUa2uzFKhCSAuwH3GXryGTE18jIGeA8Wq4ni96r+ge5yExd6s2eBHjeYrEPUO7/3fY3 Acpg== X-Gm-Message-State: AKaTC01tw+DwSP+Z+Bw41gBrBGJrK2CYDU+KLWm/HpoD+l2OssXpyzkFpkKA3YkbG8VDgA== X-Received: by 10.55.165.129 with SMTP id o123mr1400800qke.32.1479361325514; Wed, 16 Nov 2016 21:42:05 -0800 (PST) Received: from localhost.localdomain ([181.22.0.199]) by smtp.gmail.com with ESMTPSA id f66sm730904qke.12.2016.11.16.21.42.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Nov 2016 21:42:04 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Nov 2016 02:41:14 -0300 Message-Id: <20161117054115.3732-2-jamrial@gmail.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161117054115.3732-1-jamrial@gmail.com> References: <20161117054115.3732-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/3] avformat/mov: use av_stream_add_side_data() for displaymatrix 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 --- libavformat/mov.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 8d6cc12..5ba9965 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5647,20 +5647,13 @@ static int mov_read_header(AVFormatContext *s) break; case AVMEDIA_TYPE_VIDEO: if (sc->display_matrix) { - AVPacketSideData *sd, *tmp; + int ret; - tmp = av_realloc_array(st->side_data, - st->nb_side_data + 1, sizeof(*tmp)); - if (!tmp) + ret = av_stream_add_side_data(st, AV_PKT_DATA_DISPLAYMATRIX, (uint8_t*)sc->display_matrix, + sizeof(int32_t) * 9); + if (ret < 0) return AVERROR(ENOMEM); - st->side_data = tmp; - st->nb_side_data++; - - sd = &st->side_data[st->nb_side_data - 1]; - sd->type = AV_PKT_DATA_DISPLAYMATRIX; - sd->size = sizeof(int32_t) * 9; - sd->data = (uint8_t*)sc->display_matrix; sc->display_matrix = NULL; } break;