From patchwork Sun Dec 11 03:33:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 1754 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1069213vsa; Sat, 10 Dec 2016 19:34:27 -0800 (PST) X-Received: by 10.194.116.34 with SMTP id jt2mr74124314wjb.121.1481427267559; Sat, 10 Dec 2016 19:34:27 -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 n1si39650777wjf.235.2016.12.10.19.34.27; Sat, 10 Dec 2016 19:34:27 -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 9C0AE689EF3; Sun, 11 Dec 2016 05:33:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A7566689E42 for ; Sun, 11 Dec 2016 05:33:39 +0200 (EET) Received: by mail-qt0-f195.google.com with SMTP id l20so6307461qta.1 for ; Sat, 10 Dec 2016 19:33:44 -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=MVmKVHYEyTkQ7rQEJV3/AS7zFTk4Ux4uuR4pmO64QZo=; b=OM/jB8sfpRTyfeGHTqwB/mwVQUB2QPO31pycW2ZdPoOBv2Y2f6MQAnd+1+U2UWi0n1 PGoEXpq2VSSVxUoC/GxCYb1mDIduyzoNhl/AS9/w3QYkctaU39nrLtMieuMFs6ybkXqG OQElpmj2IYg/AzsShu3q9s7SVdp8VeMt0D5GpvKNyu2o9H5zH8VGN4kGbudXL05AIQ6A 9QSt1nCAyH8zzXHw7WYiTI7brlKNtZommdL/MTJpT7A2c4sLTz82dtTK3oMyAIP76Ayw iyWYz11dDrja8KQGU2EjMR5ze1H0WJ4u91iA1J2w8BoSELTx9rMM8RV97rBLEaFJH49A 8yKw== 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=MVmKVHYEyTkQ7rQEJV3/AS7zFTk4Ux4uuR4pmO64QZo=; b=buAqwSJkklUtkMc85lgAYxdHmfyHaQiGTLKfzFC54ntupfJKPD8D6xvTQvExfrjYuZ 1t1Fj5UV5+oFAuzrRCiyTKMS4TlEjkukNLnSCj8+qM7keg/gNCjDaBbVFfo+4GTf72PF u8bV3mS5nKNL5wJN/55VTncqtWdQ5y/KcN7VaMyR8Vx9Mrpw0PayflRniSHoaPs19Z0P lkNbnIHFjEZ1EcN9f+0xlEDjxX6Q0AFgZmEr/n/o1SiIbQbEhh4llwWRUawmDA4iRBUj 89E6BWADk+h8fqlKAcRaZ6UqYTuXzYhcL8DN3ZzLsx04VytV6JtKXc8rEgPfOySHkh/J jYSw== X-Gm-Message-State: AKaTC01QSpoRfD3tVu93ATWt3p/dso2ydwzUYxwDQC6P3MeXbtSWJ+8xac4Cd41KazWMtQ== X-Received: by 10.200.45.230 with SMTP id q35mr72961727qta.230.1481427222943; Sat, 10 Dec 2016 19:33:42 -0800 (PST) Received: from localhost.localdomain ([181.22.26.31]) by smtp.gmail.com with ESMTPSA id 21sm23495740qkf.17.2016.12.10.19.33.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 10 Dec 2016 19:33:42 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Dec 2016 00:33:07 -0300 Message-Id: <20161211033308.8592-5-jamrial@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161211033308.8592-1-jamrial@gmail.com> References: <20161211033308.8592-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 5/6] avformat/mov: use av_stereo3d_alloc2() 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/isom.h | 1 + libavformat/mov.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/isom.h b/libavformat/isom.h index 0fd9eb0..70c2af1 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -181,6 +181,7 @@ typedef struct MOVStreamContext { int32_t *display_matrix; AVStereo3D *stereo3d; + size_t stereo3d_size; AVSphericalMapping *spherical; size_t spherical_size; diff --git a/libavformat/mov.c b/libavformat/mov.c index 0b1c182..3f8fac7 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4535,7 +4535,7 @@ static int mov_read_st3d(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } - sc->stereo3d = av_stereo3d_alloc(); + sc->stereo3d = av_stereo3d_alloc2(&sc->stereo3d_size); if (!sc->stereo3d) return AVERROR(ENOMEM); @@ -4670,7 +4670,7 @@ static int mov_parse_uuid_spherical(MOVStreamContext *sc, AVIOContext *pb, size_ else mode = AV_STEREO3D_2D; - sc->stereo3d = av_stereo3d_alloc(); + sc->stereo3d = av_stereo3d_alloc2(&sc->stereo3d_size); if (!sc->stereo3d) goto out; @@ -5933,7 +5933,7 @@ static int mov_read_header(AVFormatContext *s) if (sc->stereo3d) { err = av_stream_add_side_data(st, AV_PKT_DATA_STEREO3D, (uint8_t *)sc->stereo3d, - sizeof(*sc->stereo3d)); + sc->stereo3d_size); if (err < 0) return err;