From patchwork Mon Apr 17 15:34:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 41228 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp2447930pzb; Mon, 17 Apr 2023 08:34:34 -0700 (PDT) X-Google-Smtp-Source: AKy350Z+FPQEYIINUMcqUuzUDI26xc3iMt0bWWEPt3Wu1O74nF5bJelz8adu3xUMqbdCo1K7NsqS X-Received: by 2002:aa7:d0cc:0:b0:504:89cb:748b with SMTP id u12-20020aa7d0cc000000b0050489cb748bmr14595647edo.33.1681745674399; Mon, 17 Apr 2023 08:34:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681745674; cv=none; d=google.com; s=arc-20160816; b=qrJWiFSrrRHLej7pbqta45Gk1EAl0EfRPl0imDxbMNR4+rNCRDuc/3YjvWMKjQAfKZ zLSUdv5IY0orWR/NtAlil52QLjS5ZKnzilx1jRKv0rBaZJPLt3z2IlliC6NBrukGe2F3 x+VPrP7S8Y3pG+R5Juy7WyA/15gVbni57lJW8hYRvHJ6bKLc4eh6DBYfutmY7rOGECgh YzwXlvXtgGYtkzslDtFydhsjGXarTzeUOSgi/z3GJ88YjaJaFB8ZBTMG59oR6qj0NZap 7g+UaXxvqTn4CDxPVQ7A6VUc092g7W4SKBk2BCaUhX7ah9KkgzaK/V65qtw7x25vPb6S jZSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=RPcmdFa9Vla3J3zr4xoGRF7cQai6NjwHT2jy7lfckg4=; b=ZRAfdpVgoRD/UsBPb3C2u7TbbY50WY+AFveTosj8lOLN736EkQ6iNx5+q7ASolMM8M aAdB0k4dpw41wfWeEDoYqMVrjt5SRWK69gvuhi2kEddlHfsiBc8aSU9h0Jm7kNvnZ47L zCztluzUXaKopI71RcaHFB2JHYlZ3f/oP9pjgmuD7CCp5g4Ke13o2jLgcEuluEFd8CZu ql2IxEc+iIfU/0ZTrE4VG89is4wSWi7bjH+AGDIgh7QZxeWSeYGOq+d1x3hidZ+bY26T ol3+SRKjxVuCOXmjcEbgbqsf7ti1wPqkMArXEW7B3DSkmg/tnRDyRMjCns1V0m/boa0O jX5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=JMwGq3Sq; 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 sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m2-20020a056402050200b00506b2c40aadsi511276edv.75.2023.04.17.08.34.33; Mon, 17 Apr 2023 08:34:34 -0700 (PDT) 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 header.s=20221208 header.b=JMwGq3Sq; 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 sp=QUARANTINE 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 519E068BE41; Mon, 17 Apr 2023 18:34:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f169.google.com (mail-oi1-f169.google.com [209.85.167.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 54F51680CAE for ; Mon, 17 Apr 2023 18:34:24 +0300 (EEST) Received: by mail-oi1-f169.google.com with SMTP id x22so5429123oiv.10 for ; Mon, 17 Apr 2023 08:34:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681745662; x=1684337662; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=uRp+woz85Qyl3wpsAglAwN1YrD8S5kIrBXcB0OoCZVc=; b=JMwGq3SqeNDUShW0Jv8M3KJN5TmIkQ2TzSQQ+yd6EZEN7J4+tpoCFoC91+ptjVoh8p DRMnmhF57gShniKM7kNe6hWVJnVm8jX7G4SLvDhZ4z4IetsmcqZxmLFN+9UZI3a++fuu /dSZZ2FAemyD/OEG64Ybvr4wHs/rqsFJylWl2gWeHnSlKzcypildaqvodqs/T6e/F7QK FCnoXOXXXA8QGnLOnP8MR77CQglN+2nsESacP7+sbMVmJtzrAGgQTSNmcc/EftnZqq7A P7w8HjkK3LYZO1tQG53ug6Y4FZlWTTUHk5dyFpeJ+/YdIvZiT0gPG1WxF4wy+D2f4rdS 7G1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681745662; x=1684337662; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=uRp+woz85Qyl3wpsAglAwN1YrD8S5kIrBXcB0OoCZVc=; b=FXRdCHwOqo4CNOC4rPvYMRUbXik9ObDYQh/xVqEejeWapZ2clbA/nOpHvRhU5eBtBO dtAMydz9+FvQ2r41o5Ebd+fdkLsjLctD233jytSuoVR78WpBbEacAKQo5ibAbF78/ucJ WG1iFMUvS9mLgqBX8ItHxb19Fx6dWqyE/pLOkwSUCD3W4VVz+UcHhXZcHqCt/Di21BSw bmkYv6s2eXrnh88QTHfBMHxfXRfiULsFCrK1ID6hUUNklvzzJUsOt60trr7nQx15ASPA ZNfgfVc8wFUrl7CCmFoIehVTJt6H59JPBfs9Hc3VoESEumwJ8erpy8MWFTroU5MIXi7p 0vJA== X-Gm-Message-State: AAQBX9cd4BYNuijc8KcKuIItd2MjJp80ijK0uS6va3qaV/XvoPg5ShMT dlQEesu4w1JCTPJHLFqhocncHA+R4wA= X-Received: by 2002:a05:6808:1286:b0:38d:ee6e:2353 with SMTP id a6-20020a056808128600b0038dee6e2353mr2554801oiw.52.1681745662266; Mon, 17 Apr 2023 08:34:22 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id k17-20020a056808069100b0038c49afdf76sm3375661oig.0.2023.04.17.08.34.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 08:34:21 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Apr 2023 12:34:08 -0300 Message-Id: <20230417153408.1225-1-jamrial@gmail.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avutil/frame: change the type of the crop fields to unsigned in the next major bump X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZKKq7I1ayAsZ size_t is unnecessarily big on 64bit arches when width and height are ints. Signed-off-by: James Almer --- libavutil/frame.h | 7 +++++++ libavutil/version.h | 1 + 2 files changed, 8 insertions(+) diff --git a/libavutil/frame.h b/libavutil/frame.h index f85d630c5c..e10a1c65e3 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -722,10 +722,17 @@ typedef struct AVFrame { * the frame intended for presentation. * @{ */ +#if FF_API_CROP_SIZE_T size_t crop_top; size_t crop_bottom; size_t crop_left; size_t crop_right; +#else + unsigned int crop_top; + unsigned int crop_bottom; + unsigned int crop_left; + unsigned int crop_right; +#endif /** * @} */ diff --git a/libavutil/version.h b/libavutil/version.h index 40f92af055..a974890d1f 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -115,6 +115,7 @@ #define FF_API_FRAME_PICTURE_NUMBER (LIBAVUTIL_VERSION_MAJOR < 59) #define FF_API_HDR_VIVID_THREE_SPLINE (LIBAVUTIL_VERSION_MAJOR < 59) #define FF_API_FRAME_PKT (LIBAVUTIL_VERSION_MAJOR < 59) +#define FF_API_CROP_SIZE_T (LIBAVUTIL_VERSION_MAJOR < 59) /** * @}