aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2014-09-14 20:56:06 -0300
committerJames Almer <jamrial@gmail.com>2014-10-05 17:09:44 -0300
commit42111bb960b5c2289a4feb4aa8ab1ef45a02b2fc (patch)
tree69ca992d78a5592fc5dddd44fd416b72e8155932
parentc02ea58c5f0a77f20c8046041edb974bb4376f4c (diff)
downloadffmpeg-42111bb960b5c2289a4feb4aa8ab1ef45a02b2fc.tar.gz
avcodec: remove obsolete FF_API_FAST_MALLOC cruft
Signed-off-by: James Almer <jamrial@gmail.com>
-rw-r--r--libavcodec/avcodec.h5
-rw-r--r--libavcodec/version.h3
2 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 1484b61315..7f985d4487 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -42,11 +42,6 @@
#include "version.h"
-#if FF_API_FAST_MALLOC
-// to provide fast_*alloc
-#include "libavutil/mem.h"
-#endif
-
/**
* @defgroup libavc Encoding/Decoding Library
* @{
diff --git a/libavcodec/version.h b/libavcodec/version.h
index baf1b4d622..0bbf453689 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -132,9 +132,6 @@
#ifndef FF_API_MAX_BFRAMES
#define FF_API_MAX_BFRAMES (LIBAVCODEC_VERSION_MAJOR < 57)
#endif
-#ifndef FF_API_FAST_MALLOC
-#define FF_API_FAST_MALLOC (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
#ifndef FF_API_NEG_LINESIZES
#define FF_API_NEG_LINESIZES (LIBAVCODEC_VERSION_MAJOR < 57)
#endif