From patchwork Sat Mar 6 19:42:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26221 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 C395944B9AF for ; Sat, 6 Mar 2021 21:43:20 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A4A34688128; Sat, 6 Mar 2021 21:43:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E8B168A8FD for ; Sat, 6 Mar 2021 21:43:13 +0200 (EET) Received: by mail-qk1-f170.google.com with SMTP id a9so5508789qkn.13 for ; Sat, 06 Mar 2021 11:43:13 -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=oOZkgnb5apTSEmHcZlA0E461GYm65tCLYjzCbgGJCtg=; b=BtKk4QCMFc6w7cFziuWhnZNFR8sobYi6tnSfu21KoZ/orXe8Y3BDrG11POor6Iede8 r9HvZGqHkBZRxZ16xU7/s25nySvzQsKJEieF8uNa9LFZdiybU/72vQreFcKyac18CukL yf7yIP8AEAKwcF81nHXzGmG89j/M17PxO8/QT1bE2IXLwyB+aJ4vJygcExRZZe5di5Bt TScHCBTV6aI2AMqIH8WNhMgfYzt1JxMDcNGxU+dOReB1eXxVnxr7yYgZlSJayY/2XwGe u4IawRULz8Yx7EgYZjywkKEi7ZwzU83xuuEDcXzVRsxN8Qsdl/Jacr14A1864046zjF9 IW6A== 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=oOZkgnb5apTSEmHcZlA0E461GYm65tCLYjzCbgGJCtg=; b=aGrshUf1/jqSCUvEIRLmLQOiPs+X3aWtX16/7vJju9F3EZRhvUVOs5uM0t89t6xf1D oXe15hdwMhWMxlIWkvX5LIcE1PWeUyt+J+/KX12cho8RbnobcLrMqw3mMs/pWqqZQ/Si BcvR0hil2bzbZMY5CXeYPJtuI1xxhIyybzzGD/bsTmo9n5x09e1qwxjCM1260F5MUXNM jkal+OSYjS3Vo9Djwn/rt8i5O7qVKgVATvI8douaxsfZFLWskITe8Ii9wfRbVbestJk0 /qD05LlQ36qZrUc/4sNiT1RC8MO7jCN9uyH1rgcyIwDngMvDkDx7nl+SrqexVrq13Uiy Uqkw== X-Gm-Message-State: AOAM533gFz2f9DrhU/JFeW5SbdLYTuaE+EQ+W0I2w2s09wkawhakhDYh gSS/JhfhlCFoaY+R2h0nTlbumpSSnxh7Fw== X-Google-Smtp-Source: ABdhPJzURu+14PdNwbsQsB/SnoHVYqk3QIrb+AdGINF0KwVPO3UlLAf0xujF5qdaedT4E8VpQTnHZg== X-Received: by 2002:a37:a996:: with SMTP id s144mr14253839qke.407.1615059791741; Sat, 06 Mar 2021 11:43:11 -0800 (PST) Received: from localhost.localdomain ([181.23.89.132]) by smtp.gmail.com with ESMTPSA id s19sm4376601qks.130.2021.03.06.11.43.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 11:43:11 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 Mar 2021 16:42:38 -0300 Message-Id: <20210306194243.14931-4-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 4/9 v2] avformat/utils: change AVStream side data related public function and struct size types to size_t 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" av_stream_add_side_data() already defines size as a size_t, so this makes it consistent across all side data functions. Signed-off-by: James Almer --- Changes since v1 is using the buffer_size_t typedef. doc/APIchanges | 4 ++++ libavformat/avformat.h | 8 ++++++++ libavformat/utils.c | 4 ++-- libavformat/version.h | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 34b15605e6..584d9ee17d 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,10 @@ libavutil: 2017-10-21 API changes, most recent first: +2021-03-xx - xxxxxxxxxx - lavf 58.72.100 - avformat.h + Change AVBufferRef related AVStream function and struct size + parameter and fields type to size_t at next major bump. + 2021-03-xx - xxxxxxxxxx - lavc 58.130.100 - packet.h Change AVBufferRef related AVPacket function and struct size parameter and fields type to size_t at next major bump. diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 7da2f3d98e..e3bd01ec7f 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -2083,7 +2083,11 @@ int av_stream_add_side_data(AVStream *st, enum AVPacketSideDataType type, * @return pointer to fresh allocated data or NULL otherwise */ uint8_t *av_stream_new_side_data(AVStream *stream, +#if FF_API_BUFFER_SIZE_T enum AVPacketSideDataType type, int size); +#else + enum AVPacketSideDataType type, size_t size); +#endif /** * Get side information from stream. * @@ -2094,7 +2098,11 @@ uint8_t *av_stream_new_side_data(AVStream *stream, * @return pointer to data if present or NULL otherwise */ uint8_t *av_stream_get_side_data(const AVStream *stream, +#if FF_API_BUFFER_SIZE_T enum AVPacketSideDataType type, int *size); +#else + enum AVPacketSideDataType type, size_t *size); +#endif AVProgram *av_new_program(AVFormatContext *s, int id); diff --git a/libavformat/utils.c b/libavformat/utils.c index 36164e0f0d..98e6c55602 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -5471,7 +5471,7 @@ int ff_generate_avci_extradata(AVStream *st) } uint8_t *av_stream_get_side_data(const AVStream *st, - enum AVPacketSideDataType type, int *size) + enum AVPacketSideDataType type, buffer_size_t *size) { int i; @@ -5524,7 +5524,7 @@ int av_stream_add_side_data(AVStream *st, enum AVPacketSideDataType type, } uint8_t *av_stream_new_side_data(AVStream *st, enum AVPacketSideDataType type, - int size) + buffer_size_t size) { int ret; uint8_t *data = av_malloc(size); diff --git a/libavformat/version.h b/libavformat/version.h index a05676d979..2a2804582c 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 58 -#define LIBAVFORMAT_VERSION_MINOR 71 +#define LIBAVFORMAT_VERSION_MINOR 72 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \