summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libmpeg2/libmpeg-0.4.1.diff17
-rw-r--r--libmpeg2/motion_comp.c4
-rw-r--r--libmpeg2/mpeg2.h2
3 files changed, 16 insertions, 7 deletions
diff --git a/libmpeg2/libmpeg-0.4.1.diff b/libmpeg2/libmpeg-0.4.1.diff
index c80616c972..6e0fc02ad7 100644
--- a/libmpeg2/libmpeg-0.4.1.diff
+++ b/libmpeg2/libmpeg-0.4.1.diff
@@ -258,9 +258,9 @@
else
#endif
+#ifdef ARCH_ARM
-+ if (1 /*accel & MPEG2_ACCEL_ARM*/) {
++ if (accel & MPEG2_ACCEL_ARM) {
+#ifdef HAVE_IWMMXT
-+ if (1 /*accel & MPEG2_ACCEL_ARM_IWMMXT*/)
++ if (accel & MPEG2_ACCEL_ARM_IWMMXT)
+ mpeg2_mc = mpeg2_mc_iwmmxt;
+ else
+#endif
@@ -291,14 +291,21 @@
#define PIC_MASK_COMPOSITE_DISPLAY 0xfffff000
typedef struct mpeg2_picture_s {
-@@ -154,6 +159,7 @@
- #define MPEG2_ACCEL_X86_MMX 1
+@@ -156,12 +160,13 @@
#define MPEG2_ACCEL_X86_3DNOW 2
#define MPEG2_ACCEL_X86_MMXEXT 4
-+#define MPEG2_ACCEL_X86_SSE2 8
+ #define MPEG2_ACCEL_X86_SSE2 8
+-#define MPEG2_ACCEL_X86_SSE3 16
#define MPEG2_ACCEL_PPC_ALTIVEC 1
#define MPEG2_ACCEL_ALPHA 1
#define MPEG2_ACCEL_ALPHA_MVI 2
+ #define MPEG2_ACCEL_SPARC_VIS 1
+ #define MPEG2_ACCEL_SPARC_VIS2 2
++#define MPEG2_ACCEL_ARM 1
++#define MPEG2_ACCEL_ARM_IWMMXT 2
+ #define MPEG2_ACCEL_DETECT 0x80000000
+
+ uint32_t mpeg2_accel (uint32_t accel);
--- libmpeg2/mpeg2_internal.h 2006-06-16 20:12:26.000000000 +0200
+++ libmpeg2/mpeg2_internal.h 2006-06-16 20:12:50.000000000 +0200
@@ -144,6 +148,12 @@
diff --git a/libmpeg2/motion_comp.c b/libmpeg2/motion_comp.c
index 38b54b8f5d..3307c0af8d 100644
--- a/libmpeg2/motion_comp.c
+++ b/libmpeg2/motion_comp.c
@@ -68,9 +68,9 @@ void mpeg2_mc_init (uint32_t accel)
else
#endif
#ifdef ARCH_ARM
- if (1 /*accel & MPEG2_ACCEL_ARM*/) {
+ if (accel & MPEG2_ACCEL_ARM) {
#ifdef HAVE_IWMMXT
- if (1 /*accel & MPEG2_ACCEL_ARM_IWMMXT*/)
+ if (accel & MPEG2_ACCEL_ARM_IWMMXT)
mpeg2_mc = mpeg2_mc_iwmmxt;
else
#endif
diff --git a/libmpeg2/mpeg2.h b/libmpeg2/mpeg2.h
index 923c9facf6..d27a4c9ee3 100644
--- a/libmpeg2/mpeg2.h
+++ b/libmpeg2/mpeg2.h
@@ -165,6 +165,8 @@ void mpeg2_custom_fbuf (mpeg2dec_t * mpeg2dec, int custom_fbuf);
#define MPEG2_ACCEL_ALPHA_MVI 2
#define MPEG2_ACCEL_SPARC_VIS 1
#define MPEG2_ACCEL_SPARC_VIS2 2
+#define MPEG2_ACCEL_ARM 1
+#define MPEG2_ACCEL_ARM_IWMMXT 2
#define MPEG2_ACCEL_DETECT 0x80000000
uint32_t mpeg2_accel (uint32_t accel);