diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-01 17:41:18 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-01 17:41:18 +0000 |
| commit | 01490fe9933eea5071130ad4b843a420dfdcc15f (patch) | |
| tree | bb97765a523147e8f691e27a33661ceccd80a466 /libmpeg2 | |
| parent | 01eb667a5516a72ede2ce83391bf3130a2509b90 (diff) | |
| download | mpv-01490fe9933eea5071130ad4b843a420dfdcc15f.tar.bz2 mpv-01490fe9933eea5071130ad4b843a420dfdcc15f.tar.xz | |
cosmetics: Fix some typos and trailing whitespace in local changes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26315 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpeg2')
| -rw-r--r-- | libmpeg2/cpu_accel.c | 8 | ||||
| -rw-r--r-- | libmpeg2/libmpeg-0.4.1.diff | 10 | ||||
| -rw-r--r-- | libmpeg2/motion_comp_arm_s.S | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/libmpeg2/cpu_accel.c b/libmpeg2/cpu_accel.c index db47a7c03f..66f7b7fdff 100644 --- a/libmpeg2/cpu_accel.c +++ b/libmpeg2/cpu_accel.c @@ -37,9 +37,9 @@ #ifdef ACCEL_DETECT #if defined(ARCH_X86) || defined(ARCH_X86_64) -/* MPlayer imports libmpeg2 as decoder, which detects MMX / 3DNow! - * instructions via assembly. However, it is regarded as duplicaed work - * in MPlayer, so that we enforce to use MPlayer's implementation. +/* MPlayer imports libmpeg2 as decoder, which detects MMX / 3DNow! + * instructions via assembly. However, it is regarded as duplicated work + * in MPlayer, so that we enforce using MPlayer's implementation. */ #define USE_MPLAYER_CPUDETECT @@ -120,7 +120,7 @@ static inline uint32_t arch_accel (void) caps |= MPEG2_ACCEL_X86_MMXEXT; return caps; -#else /* USE_MPLAYER_CPUDETECT: Use MPlayer's cpu capability property */ +#else /* USE_MPLAYER_CPUDETECT: Use MPlayer's CPU capability property. */ caps = 0; if (gCpuCaps.hasMMX) caps |= MPEG2_ACCEL_X86_MMX; diff --git a/libmpeg2/libmpeg-0.4.1.diff b/libmpeg2/libmpeg-0.4.1.diff index 885088bd4a..b8b71b93c9 100644 --- a/libmpeg2/libmpeg-0.4.1.diff +++ b/libmpeg2/libmpeg-0.4.1.diff @@ -15,9 +15,9 @@ -#ifdef ARCH_X86 +#if defined(ARCH_X86) || defined(ARCH_X86_64) + -+/* MPlayer imports libmpeg2 as decoder, which detects MMX / 3DNow! -+ * instructions via assembly. However, it is regarded as duplicaed work -+ * in MPlayer, so that we enforce to use MPlayer's implementation. ++/* MPlayer imports libmpeg2 as decoder, which detects MMX / 3DNow! ++ * instructions via assembly. However, it is regarded as duplicated work ++ * in MPlayer, so that we enforce using MPlayer's implementation. + */ +#define USE_MPLAYER_CPUDETECT + @@ -31,7 +31,7 @@ caps |= MPEG2_ACCEL_X86_MMXEXT; return caps; -+#else /* USE_MPLAYER_CPUDETECT: Use MPlayer's cpu capability property */ ++#else /* USE_MPLAYER_CPUDETECT: Use MPlayer's CPU capability property. */ + caps = 0; + if (gCpuCaps.hasMMX) + caps |= MPEG2_ACCEL_X86_MMX; @@ -565,7 +565,7 @@ Index: libmpeg2/motion_comp_arm_s.S +@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + .text -+ ++ +@ ---------------------------------------------------------------- + .align + .global MC_put_o_16_arm diff --git a/libmpeg2/motion_comp_arm_s.S b/libmpeg2/motion_comp_arm_s.S index 19e4efc053..fd71fb3b83 100644 --- a/libmpeg2/motion_comp_arm_s.S +++ b/libmpeg2/motion_comp_arm_s.S @@ -19,7 +19,7 @@ @ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA .text - + @ ---------------------------------------------------------------- .align .global MC_put_o_16_arm |