diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-12-04 04:00:21 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-12-04 04:00:21 +0000 |
| commit | 372c3f82b7d73a4bab570f357cfb299c2531a95b (patch) | |
| tree | e61bff34c2cc0ba598b4d0fad1137431f8113c4f /libavcodec/avcodec.h | |
| parent | b47541c7a38de186e85f728fd54f1a9ec6b88688 (diff) | |
Change the argument of memory allocation functions from unsigned int to size_t
with the next major bump in libavcodec.
Originally committed as revision 25872 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 8a0b304382..4a0d2fb950 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -83,6 +83,12 @@ #define FF_API_OLD_AUDIOCONVERT (LIBAVCODEC_VERSION_MAJOR < 53) #endif +#if LIBAVCODEC_VERSION_MAJOR < 53 +# define FF_INTERNALC_MEM_TYPE unsigned int +#else +# define FF_INTERNALC_MEM_TYPE size_t +#endif + #define AV_NOPTS_VALUE INT64_C(0x8000000000000000) #define AV_TIME_BASE 1000000 #define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE} @@ -4007,7 +4013,7 @@ AVBitStreamFilter *av_bitstream_filter_next(AVBitStreamFilter *f); * * @see av_realloc */ -void *av_fast_realloc(void *ptr, unsigned int *size, unsigned int min_size); +void *av_fast_realloc(void *ptr, unsigned int *size, FF_INTERNALC_MEM_TYPE min_size); /** * Allocate a buffer, reusing the given one if large enough. @@ -4021,7 +4027,7 @@ void *av_fast_realloc(void *ptr, unsigned int *size, unsigned int min_size); * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and * *size 0 if an error occurred. */ -void av_fast_malloc(void *ptr, unsigned int *size, unsigned int min_size); +void av_fast_malloc(void *ptr, unsigned int *size, FF_INTERNALC_MEM_TYPE min_size); #if LIBAVCODEC_VERSION_MAJOR < 53 /** |