From patchwork Sat Mar 6 19:42:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26224 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id E455144B9AF for ; Sat, 6 Mar 2021 21:43:25 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C91B568AA16; Sat, 6 Mar 2021 21:43:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 68D6E68A957 for ; Sat, 6 Mar 2021 21:43:17 +0200 (EET) Received: by mail-qt1-f179.google.com with SMTP id h26so228088qtm.5 for ; Sat, 06 Mar 2021 11:43:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=OJ8vWLyuInmYq7pq3/NRrufBFAdg95O7vrB9m4quU4c=; b=E2bNusL+tnQm4SN9xQuvn2yzOm/RFCatBqhHP1Qwl2ACJtwzZI9VuJWUUU57w1QMsS JVR/63/7jy7/SgCB+i5L+rae56n0Ggvqfg2wn0f73fMBUPdzUDTXUjpzTseLT7gCuUFA 2hhyH+fPHJW1ox8wCZYB5xoDwCkTItWqkzXpXbT+GEmBcTOimeTGrspJjyi/rblpuNuf 7ACK+cMCiIeI+1FOhb50fBX8m/LRjoqG0nxtO/+6uREbIXyvKyCnCoIycB6+z14N8WVx 3P3zDz+5sRRibqMJmQ3mdYI7w6xC5xcIc6KABAkwO4+DDT3hE4+MmTwyuhX1HO5JxM4v ezrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OJ8vWLyuInmYq7pq3/NRrufBFAdg95O7vrB9m4quU4c=; b=T2TO/q1VTm1UEkQk5t8dHy4Kl36Cmc+nClcwU14TqO0nRcw+7GMoKMRfDBDdWbRwl3 T1E+NRudwkTp1IdAQpF2RM0r11zYgK/vU/5cNS8XbK1+CHx13AyLqYmsxUjiSIXXFPV9 Jarithn5obeYh1F5D466CgbPbsXIqAHZOBakMFRRbbb3SyXDFmBcMus+Gsk8rInBxPfg vI57n1O3AFmotzfDKXlkCWH5TudW9o1twELdHMPPCkGiAXC1II+gLkg2YbTXChp3kOpm trqT+p0On4yD0QbUZTrTZYIadNQDjyYBrkuwh9Jq/YTrwf5FMMlcJOhIHkOo1+0ymJoQ wSHQ== X-Gm-Message-State: AOAM530PU+7GbTkYvQdwJOJCiL9dvaHTx0R/2AjmtoZwCA2k5VOoCdvz i1IYc1uqs9q2oc8go4ZKBob9MM0pwtsh7A== X-Google-Smtp-Source: ABdhPJxfuwUhhQnKYZe+tIkD/0LCLJk8k+vmsQCJFRef2z2gZ4SVbTAJLbmX76cob0OnyFDaahVA+Q== X-Received: by 2002:aed:38a6:: with SMTP id k35mr12346164qte.280.1615059795793; Sat, 06 Mar 2021 11:43:15 -0800 (PST) Received: from localhost.localdomain ([181.23.89.132]) by smtp.gmail.com with ESMTPSA id s19sm4376601qks.130.2021.03.06.11.43.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 11:43:15 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 Mar 2021 16:42:41 -0300 Message-Id: <20210306194243.14931-7-jamrial@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210306194243.14931-1-jamrial@gmail.com> References: <20210306194243.14931-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/9] avdevice: use the buffer_size_t typedef where required 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavdevice/decklink_dec.cpp | 2 +- libavdevice/decklink_enc.cpp | 3 ++- libavdevice/xcbgrab.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index 4f8103e614..6c0a338fca 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -1437,7 +1437,7 @@ int ff_decklink_read_packet(AVFormatContext *avctx, AVPacket *pkt) avpacket_queue_get(&ctx->queue, pkt, 1); if (ctx->tc_format && !(av_dict_get(ctx->video_st->metadata, "timecode", NULL, 0))) { - int size; + buffer_size_t size; const uint8_t *side_metadata = av_packet_get_side_data(pkt, AV_PKT_DATA_STRINGS_METADATA, &size); if (side_metadata) { if (av_packet_unpack_dictionary(side_metadata, size, &ctx->video_st->metadata) < 0) diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp index 6c73968d5f..df901b0d68 100644 --- a/libavdevice/decklink_enc.cpp +++ b/libavdevice/decklink_enc.cpp @@ -312,7 +312,8 @@ static void construct_cc(AVFormatContext *avctx, struct decklink_ctx *ctx, uint16_t *cdp_words; uint16_t len; uint8_t cc_count; - int size, ret, i; + buffer_size_t size; + int ret, i; const uint8_t *data = av_packet_get_side_data(pkt, AV_PKT_DATA_A53_CC, &size); if (!data) diff --git a/libavdevice/xcbgrab.c b/libavdevice/xcbgrab.c index 9604a5aaf2..f9ea5a56b2 100644 --- a/libavdevice/xcbgrab.c +++ b/libavdevice/xcbgrab.c @@ -236,7 +236,7 @@ static void free_shm_buffer(void *opaque, uint8_t *data) shmdt(data); } -static AVBufferRef *allocate_shm_buffer(void *opaque, int size) +static AVBufferRef *allocate_shm_buffer(void *opaque, buffer_size_t size) { xcb_connection_t *conn = opaque; xcb_shm_seg_t segment;