diff options
| author | Mark Harris <mark.hsj@gmail.com> | 2018-11-24 13:02:02 -0800 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-07-23 01:18:28 -0300 |
| commit | 5fd65ebf28d9e8f2c9aadf8d8ba08d181b8ddfc1 (patch) | |
| tree | c5d42ba4ea3f2a115af2465cc5f7302c1957d049 | |
| parent | ba11e4028cfc5d40f49f26a44473a4f70d67c85d (diff) | |
| download | ffmpeg-5fd65ebf28d9e8f2c9aadf8d8ba08d181b8ddfc1.tar.gz | |
avutil/mem: Fix invalid use of av_alloc_size
The alloc_size attribute is valid only on functions that return a
pointer. GCC 9 (not yet released) warns about invalid usage:
./libavutil/mem.h:342:1: warning: 'alloc_size' attribute ignored on a function returning int' [-Wattributes]
342 | av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
| ^~~~~~~~~~~~~
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 4361293fcf59edb56879c36edcd25f0a91e0edf8)
| -rw-r--r-- | libavutil/mem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/mem.h b/libavutil/mem.h index f9d8884788..5d505d22c1 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -335,7 +335,7 @@ av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, size_t size) * @warning Unlike av_malloc(), the allocated memory is not guaranteed to be * correctly aligned. */ -av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size); +int av_reallocp_array(void *ptr, size_t nmemb, size_t size); /** * Reallocate the given buffer if it is not large enough, otherwise do nothing. |