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:52 -0300 |
| commit | 0c904c0d3ff85ed5f634ff3e3202d5c1cd4a95d1 (patch) | |
| tree | 995f292b46637c4e59e4a16c5d9fffe25d016fb8 | |
| parent | 6e0cf9a9df4a21df89825427914e38bd4c6216ba (diff) | |
| download | ffmpeg-0c904c0d3ff85ed5f634ff3e3202d5c1cd4a95d1.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 7e0b12a8a7..b5c637ecf3 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -339,7 +339,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. |