Mercurial > mplayer.hg
changeset 26283:62abac0c8637
cosmetics: Fix some typos and trailing whitespace in local changes.
| author | diego |
|---|---|
| date | Tue, 01 Apr 2008 17:41:18 +0000 |
| parents | 79ab4ecba54a |
| children | c5cd2eedc579 |
| files | libmpeg2/cpu_accel.c libmpeg2/libmpeg-0.4.1.diff libmpeg2/motion_comp_arm_s.S |
| diffstat | 3 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpeg2/cpu_accel.c Tue Apr 01 17:31:37 2008 +0000 +++ b/libmpeg2/cpu_accel.c Tue Apr 01 17:41:18 2008 +0000 @@ -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 @@ 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;
--- a/libmpeg2/libmpeg-0.4.1.diff Tue Apr 01 17:31:37 2008 +0000 +++ b/libmpeg2/libmpeg-0.4.1.diff Tue Apr 01 17:41:18 2008 +0000 @@ -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 @@ +@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + .text -+ ++ +@ ---------------------------------------------------------------- + .align + .global MC_put_o_16_arm
--- a/libmpeg2/motion_comp_arm_s.S Tue Apr 01 17:31:37 2008 +0000 +++ b/libmpeg2/motion_comp_arm_s.S Tue Apr 01 17:41:18 2008 +0000 @@ -19,7 +19,7 @@ @ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA .text - + @ ---------------------------------------------------------------- .align .global MC_put_o_16_arm