From patchwork Mon Jun 1 17:25:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 20065 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 02EF444B694 for ; Mon, 1 Jun 2020 20:26:40 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D6A5468AA9A; Mon, 1 Jun 2020 20:26:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B3C1968A460 for ; Mon, 1 Jun 2020 20:26:33 +0300 (EEST) Received: by mail-qk1-f180.google.com with SMTP id c185so9816976qke.7 for ; Mon, 01 Jun 2020 10:26:33 -0700 (PDT) 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=/5ETe+3drXhJtJ+PRRskDO6gZ8XWTwIYZxVn1GKAPZA=; b=EbqXQegoq7IZH4FaFdoxXhwnso1anY8cg0+TJZ5805yNV/nVUkotxrvx3u+HICozgK 1sfzl+KbHBTfVsv2JyYUCeesTLEsJRO4RWBTWHMkmv69emfDz4Y1KrYPvZz1etuRRGQJ 2/Zv6OgPxREfPkrtiuKOGYi8O1zrJrVwSQuaFbQSjU6ww2PsXXTzs5WR/ZZdAxwRqVyT +Iq9mnOcOtjF4yPThBw/SH27FxknpS5z520iKjpyIFQ5XuaTt5im9Kdmm8fdohQVVZyQ ZdmMfDksGxZTIZuBk0+N4rieuuhhLuc0Jm9drpPGF8rQa+lEHGf+ePRZ8uRhdX6HOP6Z 69rA== 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=/5ETe+3drXhJtJ+PRRskDO6gZ8XWTwIYZxVn1GKAPZA=; b=Mq14fttJHz9Ehow5aj1WiFG51+6UF/ihECao2ETGmXiCI0un+rx6b3Nr5/I0kXKtsp SCEMgx7Iywtq+MU8dNb2IAKHl2M+oQF43VsZKCapSBvwfBhV5YNiIC29JNxXW7TN1BgB 0vwyBrVewI25Wgl308YYFHVmBPdY4DRsX/zII6BPP+NZKtacjF79lBWzx74V8VP52x6M tMME5SNNQ4rHVneZNRqJqo6eMd1H0FD1QBZlmO9Bp7tJhCrniWSZpY/yUtvOI1tQ46ZM ZEXbDULfTjs0oD5sqko/qePDodIo948l9ajzRB2/DgQYOZjH6wtYfuqDh3e/KICvtncT GyCA== X-Gm-Message-State: AOAM532j4w76gcJK99TVua5DxlG4v7VUWw35aZ0MyG2kPkos+NEhtW8O EufQ2s3J/LBtP246quUnCpUHWkc5 X-Google-Smtp-Source: ABdhPJyoIadZd7obXHSh9m/B+yXhsAdnW+CsZ4hQBYB8c/gAXYRutx0NFb6slusND4b6ig6rnZY7rw== X-Received: by 2002:a37:670c:: with SMTP id b12mr13388089qkc.195.1591032392014; Mon, 01 Jun 2020 10:26:32 -0700 (PDT) Received: from localhost.localdomain ([181.23.72.208]) by smtp.gmail.com with ESMTPSA id g132sm1839473qkb.78.2020.06.01.10.26.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jun 2020 10:26:31 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Jun 2020 14:25:39 -0300 Message-Id: <20200601172539.17081-4-jamrial@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601172539.17081-1-jamrial@gmail.com> References: <20200601172539.17081-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/utils: change stream side data related public functions 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 --- Same sitaution as Patch 3/4 but for av_stream_get_side_data(). libavformat/avformat.h | 8 ++++++++ libavformat/utils.c | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 21c282a100..ae00c50a32 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -2183,7 +2183,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. * @@ -2193,7 +2197,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 c9385318f6..03ddf955a2 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -5496,7 +5496,11 @@ int ff_generate_avci_extradata(AVStream *st) } uint8_t *av_stream_get_side_data(const AVStream *st, +#if FF_API_BUFFER_SIZE_T enum AVPacketSideDataType type, int *size) +#else + enum AVPacketSideDataType type, size_t *size) +#endif { int i; @@ -5549,7 +5553,11 @@ int av_stream_add_side_data(AVStream *st, enum AVPacketSideDataType type, } uint8_t *av_stream_new_side_data(AVStream *st, enum AVPacketSideDataType type, +#if FF_API_BUFFER_SIZE_T int size) +#else + size_t size) +#endif { int ret; uint8_t *data = av_malloc(size);