RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Michael Niedermayer 2014-08-10 20:51:15 +02:00
parent d123d9abef d63443b968
commit bd87965247
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/utils.c
View File

@ -119,24 +119,6 @@ static int volatile entangled_thread_counter = 0;
static void *codec_mutex; static void *codec_mutex;
static void *avformat_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) static inline int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, int zero_realloc)
{ {
void **p = ptr; void **p = ptr;