summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2018-08-02 20:18:19 +0200
committerMax Kellermann <max@musicpd.org>2018-08-02 20:18:19 +0200
commit69f4178bffd7b9bdfd79e4bfd4aece24c64b0adb (patch)
tree0257a08ff542275ee98d7c5a72b7147a287e82f3 /src/lib
parent027e562f65547f0a905e05c52b44b0461c6edf10 (diff)
decoder/ffmpeg: require at least version 11.12
This is the version in Debian Jessie (oldstable).
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ffmpeg/Buffer.hxx16
1 files changed, 0 insertions, 16 deletions
diff --git a/src/lib/ffmpeg/Buffer.hxx b/src/lib/ffmpeg/Buffer.hxx
index 400d0f014..0d0ae9cea 100644
--- a/src/lib/ffmpeg/Buffer.hxx
+++ b/src/lib/ffmpeg/Buffer.hxx
@@ -22,15 +22,6 @@
extern "C" {
#include <libavutil/mem.h>
-
-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52, 18, 0)
-#define HAVE_AV_FAST_MALLOC
-#else
-#include <libavcodec/avcodec.h>
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 25, 0)
-#define HAVE_AV_FAST_MALLOC
-#endif
-#endif
}
#include <stddef.h>
@@ -53,14 +44,7 @@ public:
gcc_malloc
void *Get(size_t min_size) {
-#ifdef HAVE_AV_FAST_MALLOC
av_fast_malloc(&data, &size, min_size);
-#else
- void *new_data = av_fast_realloc(data, &size, min_size);
- if (new_data == nullptr)
- return AVERROR(ENOMEM);
- data = new_data;
-#endif
return data;
}