summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/dsputil.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/libffmpeg/libavcodec/dsputil.h')
-rw-r--r--src/libffmpeg/libavcodec/dsputil.h14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/libffmpeg/libavcodec/dsputil.h b/src/libffmpeg/libavcodec/dsputil.h
index ebb4d8446..80a934ccd 100644
--- a/src/libffmpeg/libavcodec/dsputil.h
+++ b/src/libffmpeg/libavcodec/dsputil.h
@@ -2,7 +2,6 @@
#define DSPUTIL_H
#include "common.h"
-#include <inttypes.h>
/* dct code */
typedef short DCTELEM;
@@ -25,6 +24,7 @@ extern UINT8 zigzag_direct[64];
/* temporary */
extern UINT32 squareTbl[512];
+extern UINT8 cropTbl[256 + 2 * MAX_NEG_CROP];
void dsputil_init(void);
@@ -74,7 +74,7 @@ static inline int block_permute_op(int j)
void block_permute(INT16 *block);
-#ifdef HAVE_MMX
+#if defined(HAVE_MMX)
#define MM_MMX 0x0001 /* standard MMX */
#define MM_3DNOW 0x0004 /* AMD 3DNOW */
@@ -101,6 +101,16 @@ static inline void emms(void)
void dsputil_init_mmx(void);
+#elif defined(ARCH_ARMV4L)
+
+#define emms_c()
+
+/* This is to use 4 bytes read to the IDCT pointers for some 'zero'
+ line ptimizations */
+#define __align8 __attribute__ ((aligned (4)))
+
+void dsputil_init_armv4l(void);
+
#else
#define emms_c()