summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavcodec/ffv1.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 37169594fa..0a9147a0f4 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -36,6 +36,11 @@
#include "libavutil/pixdesc.h"
#include "libavutil/avassert.h"
+#ifdef __INTEL_COMPILER
+#undef av_flatten
+#define av_flatten
+#endif
+
#define MAX_PLANES 4
#define CONTEXT_SIZE 32