mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-23 07:42:51 +00:00
Merge commit 'd63443b9684fa7b3e086634f7b44b203b6d9221e'
* commit 'd63443b9684fa7b3e086634f7b44b203b6d9221e':
lavc: drop the av_fast_{re,m}alloc compatibility wrappers
Conflicts:
libavcodec/utils.c
See: a973e01501
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
bd87965247
@ -119,24 +119,6 @@ static int volatile entangled_thread_counter = 0;
|
||||
static void *codec_mutex;
|
||||
static void *avformat_mutex;
|
||||
|
||||
#if CONFIG_RAISE_MAJOR
|
||||
# define LIBNAME "LIBAVCODEC_155"
|
||||
#else
|
||||
# define LIBNAME "LIBAVCODEC_55"
|
||||
#endif
|
||||
|
||||
#if FF_API_FAST_MALLOC && CONFIG_SHARED && HAVE_SYMVER
|
||||
FF_SYMVER(void*, av_fast_realloc, (void *ptr, unsigned int *size, size_t min_size), LIBNAME)
|
||||
{
|
||||
return av_fast_realloc(ptr, size, min_size);
|
||||
}
|
||||
|
||||
FF_SYMVER(void, av_fast_malloc, (void *ptr, unsigned int *size, size_t min_size), LIBNAME)
|
||||
{
|
||||
av_fast_malloc(ptr, size, min_size);
|
||||
}
|
||||
#endif
|
||||
|
||||
static inline int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, int zero_realloc)
|
||||
{
|
||||
void **p = ptr;
|
||||
|
Loading…
Reference in New Issue
Block a user