diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 20:51:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 20:51:15 +0200 |
| commit | bd879652476b1d57628f09531038ef4487fd68a6 (patch) | |
| tree | 984a0b25c7d7e8c1606f3129b4fc78924ed271da | |
| parent | d123d9abef52931f54701e5fb0ed569416258f75 (diff) | |
| parent | d63443b9684fa7b3e086634f7b44b203b6d9221e (diff) | |
| download | ffmpeg-bd879652476b1d57628f09531038ef4487fd68a6.tar.gz | |
Merge commit 'd63443b9684fa7b3e086634f7b44b203b6d9221e'
* commit 'd63443b9684fa7b3e086634f7b44b203b6d9221e':
lavc: drop the av_fast_{re,m}alloc compatibility wrappers
Conflicts:
libavcodec/utils.c
See: a973e01501bc3ca5c61d778f97f350837d4ed481
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/utils.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 62d4b264c3..de371e8a81 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -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; |