From patchwork Sun Dec 11 03:33:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 1751 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1069185vsa; Sat, 10 Dec 2016 19:34:18 -0800 (PST) X-Received: by 10.28.26.197 with SMTP id a188mr3903916wma.93.1481427258042; Sat, 10 Dec 2016 19:34:18 -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 h13si39665512wjs.271.2016.12.10.19.34.17; Sat, 10 Dec 2016 19:34:18 -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 58ABB689E5F; 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-f196.google.com (mail-qt0-f196.google.com [209.85.216.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 72CD1689E42 for ; Sun, 11 Dec 2016 05:33:38 +0200 (EET) Received: by mail-qt0-f196.google.com with SMTP id m48so6298884qta.2 for ; Sat, 10 Dec 2016 19:33:42 -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=baSoZUHicI3rRpSEq75nSu/Q7JhT4HKK9T9lp8MucEI=; b=GonsMcoGagpI6eThxGxaM/hztUJ1kk0DAXbbY94iz/odrwrOe5HO6FLpg3av80sssO uv4vC6cCHYoxlMJpnJ/+9LO8DscCd+zOjfd6Q/JwCFFx0EwqqNHkBStpHj4OuDO3dzc8 cSXf0b5UsYs9ViyVmTZQnM0pkj6KoxYcwr6+rSCEx+/tFy5VFnYOAEcS8D9xhx+lf91g +cFDGfwY4iowQConaTGxyp0X0+tBo30l1VfIdLVruaoHcPmocDWq6VA0wh8gBbeBLaMU Szyapp/u2bQSSIjeucE7Y2ew2gz/BwOHmMou8nFKwwPMTCqC01cYdTUW4MhTe+J0T1dd xRFQ== 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=baSoZUHicI3rRpSEq75nSu/Q7JhT4HKK9T9lp8MucEI=; b=OkbfpffXOILudbPp3unXArWmhslPVSreC0I10vGcfNSME4HGWHM+cXs6kFmviEgE9L Y6LCAqYrkrYk37Mp2srw59trIAaTGz1cTtVWLq7ZM670zkaWCsVLNGcyAGrvsh8aklVn QRVUTcT0k+5QWgwPy9gncacpJPGg2Yd/7GPoHis+w3D7EUiX4Z19f+7hraw3rh+oK/Bt qGeDD42aYUb5fQof0VrSZ74BayVdvC8EH3nHYX5WpLa8DiV/tOHkhqY0rMSl5Xfu2hIX Uvgk7HKUlXG1Yag4K3OeGzHkqMN1vUENn0He5BuHRap627l43BSB0gqDSwdgMJERkC1Y 11dQ== X-Gm-Message-State: AKaTC02hcxxBN44vez8d/6Z+Un6dnbtlBf8qYJTTH6H2BEwbDC+ekAprhjXyfaoSKTuyjA== X-Received: by 10.200.54.209 with SMTP id b17mr75128435qtc.183.1481427221739; Sat, 10 Dec 2016 19:33:41 -0800 (PST) Received: from localhost.localdomain ([181.22.26.31]) by smtp.gmail.com with ESMTPSA id 21sm23495740qkf.17.2016.12.10.19.33.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 10 Dec 2016 19:33:41 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Dec 2016 00:33:06 -0300 Message-Id: <20161211033308.8592-4-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 4/6] avformat/matroska: 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/matroska.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/matroska.c b/libavformat/matroska.c index f3e1be7..259e50f 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -151,9 +151,10 @@ const char * const ff_matroska_video_stereo_plane[MATROSKA_VIDEO_STEREO_PLANE_CO int ff_mkv_stereo3d_conv(AVStream *st, MatroskaVideoStereoModeType stereo_mode) { AVStereo3D *stereo; + size_t stereo3d_size; int ret; - stereo = av_stereo3d_alloc(); + stereo = av_stereo3d_alloc2(&stereo3d_size); if (!stereo) return AVERROR(ENOMEM); @@ -195,7 +196,7 @@ int ff_mkv_stereo3d_conv(AVStream *st, MatroskaVideoStereoModeType stereo_mode) } ret = av_stream_add_side_data(st, AV_PKT_DATA_STEREO3D, (uint8_t *)stereo, - sizeof(*stereo)); + stereo3d_size); if (ret < 0) { av_freep(&stereo); return ret;