diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-01 23:15:36 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-01 23:15:36 +0000 |
| commit | 9fd59e537952f8eea2124981710351ce28d12f9f (patch) | |
| tree | e5c84d16f69cc3afef30de78333e86f6c5c0d800 /libmpeg2 | |
| parent | c8562086dd7fba815053f29b9844b0fd8c64da6f (diff) | |
| download | mpv-9fd59e537952f8eea2124981710351ce28d12f9f.tar.bz2 mpv-9fd59e537952f8eea2124981710351ce28d12f9f.tar.xz | |
Fix ARM linking failure when IWMMXT support is disabled.
patch by Siarhei Siamashka, siarhei.siamashka gmail com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27393 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpeg2')
| -rw-r--r-- | libmpeg2/libmpeg-0.4.1.diff | 7 | ||||
| -rw-r--r-- | libmpeg2/motion_comp.c | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/libmpeg2/libmpeg-0.4.1.diff b/libmpeg2/libmpeg-0.4.1.diff index 6231a24615..133ea8b4e4 100644 --- a/libmpeg2/libmpeg-0.4.1.diff +++ b/libmpeg2/libmpeg-0.4.1.diff @@ -194,14 +194,17 @@ if (accel & MPEG2_ACCEL_PPC_ALTIVEC) mpeg2_mc = mpeg2_mc_altivec; else -@@ -67,6 +61,13 @@ +@@ -61,6 +61,16 @@ mpeg2_mc = mpeg2_mc_vis; else #endif +#ifdef ARCH_ARM ++#ifdef HAVE_IWMMXT + if (accel & MPEG2_ACCEL_ARM_IWMMXT) + mpeg2_mc = mpeg2_mc_iwmmxt; -+ else if (accel & MPEG2_ACCEL_ARM) ++ else ++#endif ++ if (accel & MPEG2_ACCEL_ARM) + mpeg2_mc = mpeg2_mc_arm; + else +#endif diff --git a/libmpeg2/motion_comp.c b/libmpeg2/motion_comp.c index a8232c9fa3..37c9c3db0e 100644 --- a/libmpeg2/motion_comp.c +++ b/libmpeg2/motion_comp.c @@ -62,9 +62,12 @@ void mpeg2_mc_init (uint32_t accel) else #endif #ifdef ARCH_ARM +#ifdef HAVE_IWMMXT if (accel & MPEG2_ACCEL_ARM_IWMMXT) mpeg2_mc = mpeg2_mc_iwmmxt; - else if (accel & MPEG2_ACCEL_ARM) + else +#endif + if (accel & MPEG2_ACCEL_ARM) mpeg2_mc = mpeg2_mc_arm; else #endif |