summaryrefslogtreecommitdiffstats
path: root/compat
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-12-11 14:35:52 +0100
committerwm4 <wm4@nowhere>2012-12-11 15:26:02 +0100
commit0fba387f72808c0298b3c34874d1388d8fd34def (patch)
tree349ca7418abb9f07d36b86c24002f25c08865e26 /compat
parentc6fbf91a89db31081e740e77bf7c965147d4dc06 (diff)
downloadmpv-0fba387f72808c0298b3c34874d1388d8fd34def.tar.bz2
mpv-0fba387f72808c0298b3c34874d1388d8fd34def.tar.xz
Fix compilation with Libav
Doesn't define AVPROBE_SCORE_RETRY for some reason. They use AVPROBE_SCORE_MAX/4 directly internally. AV_DISPOSITION_ATTACHED_PIC is not defined with the most recent Libav release. AVIOContext.av_class exists in Libav, but is apparently disabled in old releases. Disable it for now until people stop torturing me with old crap releases.
Diffstat (limited to 'compat')
-rw-r--r--compat/libav.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/compat/libav.h b/compat/libav.h
index 6751fe9a39..6546a76755 100644
--- a/compat/libav.h
+++ b/compat/libav.h
@@ -22,6 +22,7 @@
#include <libavutil/avutil.h>
#include <libavutil/cpu.h>
#include <libavcodec/version.h>
+#include <libavformat/version.h>
#ifndef AV_CPU_FLAG_MMX2
#define AV_CPU_FLAG_MMX2 AV_CPU_FLAG_MMXEXT
@@ -39,4 +40,13 @@
#define avcodec_free_frame av_freep
#endif
+#if LIBAVFORMAT_VERSION_MICRO < 100
+#define AVPROBE_SCORE_RETRY (AVPROBE_SCORE_MAX/4)
+#endif
+
+// For Libav 0.9
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(54, 2, 100)
+#define AV_DISPOSITION_ATTACHED_PIC 0x0400
+#endif
+
#endif /* MPV_LIBAV_COMPAT_H */