diff options
| author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2012-11-03 18:06:23 +0100 |
|---|---|---|
| committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2012-11-03 18:22:56 +0100 |
| commit | e6a6a602760387f2270bab0cab8426e178374f96 (patch) | |
| tree | cf139afe2d070a1b5a19acc491cc5771402af108 /libav_compat.h | |
| parent | 6e6fc03828e4f88c975d086b2a9f30a8263ae6e7 (diff) | |
| download | mpv-e6a6a602760387f2270bab0cab8426e178374f96.tar.bz2 mpv-e6a6a602760387f2270bab0cab8426e178374f96.tar.xz | |
libav_compat: fix mmx2 define, provide fallback for avcodec_free_frame
Diffstat (limited to 'libav_compat.h')
| -rw-r--r-- | libav_compat.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libav_compat.h b/libav_compat.h index d057f5ea2b..ec6570f0f0 100644 --- a/libav_compat.h +++ b/libav_compat.h @@ -20,9 +20,11 @@ #define MPV_LIBAV_COMPAT_H #include <libavutil/version.h> +#include <libavutil/avutil.h> #include <libavutil/cpu.h> +#include <libavcodec/version.h> -#ifdef AV_CPU_FLAG_MMXEXT +#ifndef AV_CPU_FLAG_MMX2 #define AV_CPU_FLAG_MMX2 AV_CPU_FLAG_MMXEXT #endif @@ -30,4 +32,8 @@ #define AV_CODEC_ID_SUBRIP CODEC_ID_TEXT #endif +#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 28, 0) +#define avcodec_free_frame av_freep +#endif + #endif /* MPV_LIBAV_COMPAT_H */ |