From patchwork Sun Dec 11 03:33:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 1753 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1069136vsa; Sat, 10 Dec 2016 19:34:07 -0800 (PST) X-Received: by 10.194.172.100 with SMTP id bb4mr71732581wjc.53.1481427247697; Sat, 10 Dec 2016 19:34:07 -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 rl18si39766903wjb.99.2016.12.10.19.34.07; Sat, 10 Dec 2016 19:34:07 -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 D873B689E71; Sun, 11 Dec 2016 05:33:45 +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 38C91689C9D for ; Sun, 11 Dec 2016 05:33:37 +0200 (EET) Received: by mail-qt0-f195.google.com with SMTP id m48so6298870qta.2 for ; Sat, 10 Dec 2016 19:33:41 -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=3di9GTLs96R4lNSHKC7Ak/CAbt5e9CrWmKoCbwNkpHU=; b=yK1TMWsOplNEMHODJSbjjpKSSPRCevzRqJY6xuXYe4DkyZq4bckaD1rc5IHblTiFnp fAdK2OdbmvyQ/LxGt9BeBtlNZ+Aqk3YhmsdtDThsKr3EfJnfTwLBqEJeCc1tIYfC07Ja kmspuhCtZouyvUADKpG56qbBrlgYLK/Gr7gaXl2Y3O0iDC1oyuJmeo8vvGp0BeIThr6Z KlHDSsjTUadOH7X9bAp8aeOIIttAZLA2ab5kgJbFc+yQON8dXV/CyKZF73d+6oXcMQak JaimCSJCkvGbPQ7ALGynxeSrAN8xPETkwB+eshxRT9BpwyswFJkuBUDQcX7Tdkhn+JNA nzJg== 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=3di9GTLs96R4lNSHKC7Ak/CAbt5e9CrWmKoCbwNkpHU=; b=Vx+y3dzp7KcQOr7ECyuc+P9ABazzTYGFY4YryQA5w0olKv4gjtv6mrLRiQjwRsiDIa +dImc2WHm1Td9gY1xhnEchZRdI1yrZdEHLd46cRNINp3GIYazLz/yS8wPNbeJGXHF4kN 9zze1WRDl9stKtIExsp2CBMdlYB09D/CQpbmMWFCuQAHlOf7idY1FsiDnWtw7Y1cgvEe zR8v+KNGWRNa1gW4MFSQoetxVCoHbED9flDKx9QFXgWkTk2gDpMwA6ACZRPXu+Q+aShh kTnWLiy81+h6LehyV8RFA73lqpwzVwsmEObwcp+jQxgDEam7RHQ2LueIY86SInqGLxwR ou+w== X-Gm-Message-State: AKaTC01GCjzgwALXLGk+GscFHTBPA+nMFTSMgg5oMKVRS5BtOnSkmFrwklbFOIKajfIJhA== X-Received: by 10.200.57.71 with SMTP id t7mr83540813qtb.59.1481427220502; Sat, 10 Dec 2016 19:33:40 -0800 (PST) Received: from localhost.localdomain ([181.22.26.31]) by smtp.gmail.com with ESMTPSA id 21sm23495740qkf.17.2016.12.10.19.33.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 10 Dec 2016 19:33:40 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Dec 2016 00:33:05 -0300 Message-Id: <20161211033308.8592-3-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 3/6] avutil/stereo3d: add 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" Also deprecate av_stereo3d_alloc(). This new alloc function optionally returns the size of the AVStereo3D struct. Signed-off-by: James Almer --- libavutil/stereo3d.c | 12 ++++++++++++ libavutil/stereo3d.h | 14 ++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/libavutil/stereo3d.c b/libavutil/stereo3d.c index a538364..bdea287 100644 --- a/libavutil/stereo3d.c +++ b/libavutil/stereo3d.c @@ -30,6 +30,18 @@ AVStereo3D *av_stereo3d_alloc(void) return av_mallocz(sizeof(AVStereo3D)); } +AVStereo3D *av_stereo3d_alloc2(size_t *size) +{ + AVStereo3D *stereo3d = av_mallocz(sizeof(AVStereo3D)); + if (!stereo3d) + return NULL; + + if (size) + *size = sizeof(*stereo3d); + + return stereo3d; +} + AVStereo3D *av_stereo3d_create_side_data(AVFrame *frame) { AVFrameSideData *side_data = av_frame_new_side_data(frame, diff --git a/libavutil/stereo3d.h b/libavutil/stereo3d.h index 19c5416..d82a4b8 100644 --- a/libavutil/stereo3d.h +++ b/libavutil/stereo3d.h @@ -21,8 +21,10 @@ #ifndef AVUTIL_STEREO3D_H #define AVUTIL_STEREO3D_H +#include #include +#include "attributes.h" #include "frame.h" /** @@ -137,10 +139,22 @@ typedef struct AVStereo3D { * The resulting struct can be freed using av_freep(). * * @return An AVStereo3D filled with default values or NULL on failure. + * + * @deprecated Use av_stereo3d_alloc2(). */ +attribute_deprecated AVStereo3D *av_stereo3d_alloc(void); /** + * Allocate an AVStereo3D structure and set its fields to default values. + * The resulting struct can be freed using av_freep(). + * + * @param size pointer for AVStereo3D structure size to store (optional) + * @return An AVStereo3D filled with default values or NULL on failure. + */ +AVStereo3D *av_stereo3d_alloc2(size_t *size); + +/** * Allocate a complete AVFrameSideData and add it to the frame. * * @param frame The frame which side data is added to.