summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root@loongson.inter.it>2007-08-04 20:38:03 +0800
committerroot <root@loongson.inter.it>2007-08-04 20:38:03 +0800
commitd21e36cf43d34619965a3dca829e8d46f0497d71 (patch)
tree567d7c12782c33db439c1e35cee0745a5ed0e079 /media-video
parentadd binutils (diff)
downloadloongson-d21e36cf43d34619965a3dca829e8d46f0497d71.tar.gz
loongson-d21e36cf43d34619965a3dca829e8d46f0497d71.tar.bz2
loongson-d21e36cf43d34619965a3dca829e8d46f0497d71.zip
failed mplayer patch
no big improvement
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mplayer/Manifest8
-rw-r--r--media-video/mplayer/files/mplayer-loongson.patch6599
2 files changed, 4928 insertions, 1679 deletions
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 031f00d..af0b131 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -2,10 +2,10 @@ AUX mplayer-1.0_rc1-asmrules.patch 1450 RMD160 370877b45b314c9deb2d89739f8067a4a
MD5 f0b71c38b1207c1d604be091876ac051 files/mplayer-1.0_rc1-asmrules.patch 1450
RMD160 370877b45b314c9deb2d89739f8067a4a77c0844 files/mplayer-1.0_rc1-asmrules.patch 1450
SHA256 3f71e6f4e07940d4d55084d0df12404371bc4e534a3a6b0756ca73e44ddbc3c4 files/mplayer-1.0_rc1-asmrules.patch 1450
-AUX mplayer-loongson.patch 189025 RMD160 b2d4a8c1c57e1f4389faacb9da92fc2c0dd4b68d SHA1 8a18e5ccd1fa75dc04f70ae0c69a4f0ded8ea538 SHA256 294cf38dcc15e65deb7d7a873967a938ac383638fc4e062dee28a0fd1c4dc9fe
-MD5 bec03003ba53cfc42485d31e6dba86f2 files/mplayer-loongson.patch 189025
-RMD160 b2d4a8c1c57e1f4389faacb9da92fc2c0dd4b68d files/mplayer-loongson.patch 189025
-SHA256 294cf38dcc15e65deb7d7a873967a938ac383638fc4e062dee28a0fd1c4dc9fe files/mplayer-loongson.patch 189025
+AUX mplayer-loongson.patch 319504 RMD160 0358a4d845141cf93757cb769cf1196634bc873b SHA1 a80912f8b178fca85e5e19271628a4e26965a771 SHA256 e0d8077d13a47d21552bb019e972c8732c423518265e9a1b6549172a426f1528
+MD5 4bb188f245eb6a633f0d95e71a870d6c files/mplayer-loongson.patch 319504
+RMD160 0358a4d845141cf93757cb769cf1196634bc873b files/mplayer-loongson.patch 319504
+SHA256 e0d8077d13a47d21552bb019e972c8732c423518265e9a1b6549172a426f1528 files/mplayer-loongson.patch 319504
AUX mplayer-undefined-reference-fix.patch 316 RMD160 cbbcc1df4e0011f12baffdbae3ec6037123e628e SHA1 63a8b250a9e3e929549f10786000daf5fab9bc3a SHA256 1b7004af914727c1710602dfef3dd2828896f5d4f309c1742ee0dcbd1989b346
MD5 04bb7e15784fc0b9898526d873bc1ba9 files/mplayer-undefined-reference-fix.patch 316
RMD160 cbbcc1df4e0011f12baffdbae3ec6037123e628e files/mplayer-undefined-reference-fix.patch 316
diff --git a/media-video/mplayer/files/mplayer-loongson.patch b/media-video/mplayer/files/mplayer-loongson.patch
index 984f10d..29cb9e1 100644
--- a/media-video/mplayer/files/mplayer-loongson.patch
+++ b/media-video/mplayer/files/mplayer-loongson.patch
@@ -1,6 +1,807 @@
-diff -urN mplayer-20070622.orig/libavcodec/dsputil.c mplayer-20070622/libavcodec/dsputil.c
---- mplayer-20070622.orig/libavcodec/dsputil.c 2007-06-16 19:44:57.000000000 +0800
-+++ mplayer-20070622/libavcodec/dsputil.c 2007-08-04 07:18:20.000000000 +0800
+diff -urN -x .git mplayer.orig/add.sh mplayer-20070622/add.sh
+--- mplayer.orig/add.sh 1970-01-01 08:00:00.000000000 +0800
++++ mplayer-20070622/add.sh 2007-08-04 17:51:04.000000000 +0800
+@@ -0,0 +1,7 @@
++#!/bin/sh
++
++sed -i -e "
++/\<string\.h\>/ {
++ a\
++#include \"libvo/fastmemset\.h\"
++}" $1
+diff -urN -x .git mplayer.orig/asxparser.c mplayer-20070622/asxparser.c
+--- mplayer.orig/asxparser.c 2006-08-01 01:39:17.000000000 +0800
++++ mplayer-20070622/asxparser.c 2007-08-04 17:48:51.000000000 +0800
+@@ -4,6 +4,7 @@
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include "playtree.h"
+diff -urN -x .git mplayer.orig/codec-cfg.c mplayer-20070622/codec-cfg.c
+--- mplayer.orig/codec-cfg.c 2007-03-12 16:52:45.000000000 +0800
++++ mplayer-20070622/codec-cfg.c 2007-08-04 17:48:51.000000000 +0800
+@@ -24,6 +24,7 @@
+ #include <ctype.h>
+ #include <assert.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/command.c mplayer-20070622/command.c
+--- mplayer.orig/command.c 2007-06-21 16:18:51.000000000 +0800
++++ mplayer-20070622/command.c 2007-08-04 17:48:51.000000000 +0800
+@@ -2,6 +2,7 @@
+ #include <inttypes.h>
+ #include <unistd.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "input/input.h"
+diff -urN -x .git mplayer.orig/cpudetect.c mplayer-20070622/cpudetect.c
+--- mplayer.orig/cpudetect.c 2007-01-10 22:56:23.000000000 +0800
++++ mplayer-20070622/cpudetect.c 2007-08-04 17:48:52.000000000 +0800
+@@ -13,6 +13,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #if defined (__NetBSD__) || defined(__OpenBSD__)
+ #include <sys/param.h>
+diff -urN -x .git mplayer.orig/cpuinfo.c mplayer-20070622/cpuinfo.c
+--- mplayer.orig/cpuinfo.c 2007-05-21 15:47:53.000000000 +0800
++++ mplayer-20070622/cpuinfo.c 2007-08-04 17:48:52.000000000 +0800
+@@ -6,6 +6,7 @@
+ #include <sys/time.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #if defined(__MINGW32__) && (__MINGW32_MAJOR_VERSION <= 3) && (__MINGW32_MINOR_VERSION < 10)
+diff -urN -x .git mplayer.orig/drivers/mga_vid.c mplayer-20070622/drivers/mga_vid.c
+--- mplayer.orig/drivers/mga_vid.c 2007-03-17 23:12:58.000000000 +0800
++++ mplayer-20070622/drivers/mga_vid.c 2007-08-04 17:53:12.000000000 +0800
+@@ -41,6 +41,7 @@
+ #include <linux/sched.h>
+ #include <linux/mm.h>
+ #include <linux/string.h>
++#include "libvo/fastmemset.h"
+ #include <linux/errno.h>
+
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,10)
+diff -urN -x .git mplayer.orig/drivers/mga_vid_test.c mplayer-20070622/drivers/mga_vid_test.c
+--- mplayer.orig/drivers/mga_vid_test.c 2002-06-01 05:42:15.000000000 +0800
++++ mplayer-20070622/drivers/mga_vid_test.c 2007-08-04 17:53:12.000000000 +0800
+@@ -18,6 +18,7 @@
+ #include <sys/mman.h>
+ #include <inttypes.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include "mga_vid.h"
+
+ mga_vid_config_t config;
+diff -urN -x .git mplayer.orig/drivers/radeon_vid.c mplayer-20070622/drivers/radeon_vid.c
+--- mplayer.orig/drivers/radeon_vid.c 2007-03-18 05:27:42.000000000 +0800
++++ mplayer-20070622/drivers/radeon_vid.c 2007-08-04 17:53:12.000000000 +0800
+@@ -48,6 +48,7 @@
+ #include <linux/sched.h>
+ #include <linux/mm.h>
+ #include <linux/string.h>
++#include "libvo/fastmemset.h"
+ #include <linux/errno.h>
+ #include <linux/slab.h>
+ #include <linux/pci.h>
+diff -urN -x .git mplayer.orig/drivers/tdfx_vid.c mplayer-20070622/drivers/tdfx_vid.c
+--- mplayer.orig/drivers/tdfx_vid.c 2003-07-09 09:30:24.000000000 +0800
++++ mplayer-20070622/drivers/tdfx_vid.c 2007-08-04 17:53:12.000000000 +0800
+@@ -7,6 +7,7 @@
+ #include <linux/sched.h>
+ #include <linux/mm.h>
+ #include <linux/string.h>
++#include "libvo/fastmemset.h"
+ #include <linux/errno.h>
+
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,10)
+diff -urN -x .git mplayer.orig/dvdread/dvd_reader.c mplayer-20070622/dvdread/dvd_reader.c
+--- mplayer.orig/dvdread/dvd_reader.c 2006-11-09 07:08:41.000000000 +0800
++++ mplayer-20070622/dvdread/dvd_reader.c 2007-08-04 17:53:12.000000000 +0800
+@@ -32,6 +32,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+ #include <limits.h>
+ #include <dirent.h>
+diff -urN -x .git mplayer.orig/dvdread/dvd_udf.c mplayer-20070622/dvdread/dvd_udf.c
+--- mplayer.orig/dvdread/dvd_udf.c 2006-06-22 21:34:00.000000000 +0800
++++ mplayer-20070622/dvdread/dvd_udf.c 2007-08-04 17:53:12.000000000 +0800
+@@ -37,6 +37,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #ifndef __MINGW32__
+ #include <sys/ioctl.h>
+ #endif
+diff -urN -x .git mplayer.orig/dvdread/ifo_print.c mplayer-20070622/dvdread/ifo_print.c
+--- mplayer.orig/dvdread/ifo_print.c 2006-11-09 06:45:11.000000000 +0800
++++ mplayer-20070622/dvdread/ifo_print.c 2007-08-04 17:53:12.000000000 +0800
+@@ -29,6 +29,7 @@
+ #include <unistd.h>
+ #include <inttypes.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <ctype.h>
+
+ #include "ifo_types.h"
+diff -urN -x .git mplayer.orig/dvdread/ifo_read.c mplayer-20070622/dvdread/ifo_read.c
+--- mplayer.orig/dvdread/ifo_read.c 2006-11-09 06:45:11.000000000 +0800
++++ mplayer-20070622/dvdread/ifo_read.c 2007-08-04 17:53:13.000000000 +0800
+@@ -28,6 +28,7 @@
+ #include <stdlib.h>
+ #include <inttypes.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "bswap.h"
+ #include "ifo_types.h"
+diff -urN -x .git mplayer.orig/dvdread/md5.c mplayer-20070622/dvdread/md5.c
+--- mplayer.orig/dvdread/md5.c 2005-07-01 14:28:03.000000000 +0800
++++ mplayer-20070622/dvdread/md5.c 2007-08-04 17:53:13.000000000 +0800
+@@ -29,6 +29,7 @@
+ #if STDC_HEADERS || defined _LIBC
+ # include <stdlib.h>
+ # include <string.h>
++#include "libvo/fastmemset.h"
+ #else
+ # ifndef HAVE_MEMCPY
+ # define memcpy(d, s, n) bcopy ((s), (d), (n))
+diff -urN -x .git mplayer.orig/dvdread/nav_read.c mplayer-20070622/dvdread/nav_read.c
+--- mplayer.orig/dvdread/nav_read.c 2005-07-01 06:48:26.000000000 +0800
++++ mplayer-20070622/dvdread/nav_read.c 2007-08-04 17:53:13.000000000 +0800
+@@ -20,6 +20,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "bswap.h"
+diff -urN -x .git mplayer.orig/get_path.c mplayer-20070622/get_path.c
+--- mplayer.orig/get_path.c 2006-07-04 07:27:37.000000000 +0800
++++ mplayer-20070622/get_path.c 2007-08-04 17:48:52.000000000 +0800
+@@ -16,6 +16,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #endif
+
+ char *get_path(const char *filename){
+diff -urN -x .git mplayer.orig/gui/app.c mplayer-20070622/gui/app.c
+--- mplayer.orig/gui/app.c 2006-11-26 02:37:37.000000000 +0800
++++ mplayer-20070622/gui/app.c 2007-08-04 17:53:13.000000000 +0800
+@@ -3,6 +3,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/gui/bitmap.c mplayer-20070622/gui/bitmap.c
+--- mplayer.orig/gui/bitmap.c 2007-06-12 16:38:42.000000000 +0800
++++ mplayer-20070622/gui/bitmap.c 2007-08-04 17:53:13.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "mp_msg.h"
+ #include "help_mp.h"
+diff -urN -x .git mplayer.orig/gui/cfg.c mplayer-20070622/gui/cfg.c
+--- mplayer.orig/gui/cfg.c 2006-12-03 01:24:17.000000000 +0800
++++ mplayer-20070622/gui/cfg.c 2007-08-04 17:53:13.000000000 +0800
+@@ -2,6 +2,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/gui/interface.c mplayer-20070622/gui/interface.c
+--- mplayer.orig/gui/interface.c 2007-05-21 05:07:14.000000000 +0800
++++ mplayer-20070622/gui/interface.c 2007-08-04 17:53:13.000000000 +0800
+@@ -3,6 +3,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/types.h>
+
+ #include "wm/ws.h"
+diff -urN -x .git mplayer.orig/input/input.c mplayer-20070622/input/input.c
+--- mplayer.orig/input/input.c 2007-06-21 16:18:51.000000000 +0800
++++ mplayer-20070622/input/input.c 2007-08-04 17:53:18.000000000 +0800
+@@ -2,6 +2,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <errno.h>
+diff -urN -x .git mplayer.orig/input/joystick.c mplayer-20070622/input/joystick.c
+--- mplayer.orig/input/joystick.c 2007-05-20 00:59:24.000000000 +0800
++++ mplayer-20070622/input/joystick.c 2007-08-04 17:53:18.000000000 +0800
+@@ -7,6 +7,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+diff -urN -x .git mplayer.orig/input/lirc.c mplayer-20070622/input/lirc.c
+--- mplayer.orig/input/lirc.c 2006-10-13 07:48:52.000000000 +0800
++++ mplayer-20070622/input/lirc.c 2007-08-04 17:53:18.000000000 +0800
+@@ -5,6 +5,7 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
+diff -urN -x .git mplayer.orig/liba52/downmix.c mplayer-20070622/liba52/downmix.c
+--- mplayer.orig/liba52/downmix.c 2006-08-13 08:21:14.000000000 +0800
++++ mplayer-20070622/liba52/downmix.c 2007-08-04 17:53:18.000000000 +0800
+@@ -30,6 +30,7 @@
+ #include "config.h"
+
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "a52.h"
+diff -urN -x .git mplayer.orig/liba52/parse.c mplayer-20070622/liba52/parse.c
+--- mplayer.orig/liba52/parse.c 2006-11-08 22:48:36.000000000 +0800
++++ mplayer-20070622/liba52/parse.c 2007-08-04 17:53:19.000000000 +0800
+@@ -30,6 +30,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "a52.h"
+diff -urN -x .git mplayer.orig/liba52/test.c mplayer-20070622/liba52/test.c
+--- mplayer.orig/liba52/test.c 2004-08-07 22:15:55.000000000 +0800
++++ mplayer-20070622/liba52/test.c 2007-08-04 17:53:19.000000000 +0800
+@@ -10,6 +10,7 @@
+ #include <stdlib.h>
+ #include <inttypes.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "a52.h"
+ #include "mm_accel.h"
+diff -urN -x .git mplayer.orig/libaf/af.c mplayer-20070622/libaf/af.c
+--- mplayer.orig/libaf/af.c 2006-11-09 02:31:04.000000000 +0800
++++ mplayer-20070622/libaf/af.c 2007-08-04 17:53:19.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #ifdef HAVE_MALLOC_H
+ #include <malloc.h>
+diff -urN -x .git mplayer.orig/libaf/af_center.c mplayer-20070622/libaf/af_center.c
+--- mplayer.orig/libaf/af_center.c 2007-03-20 17:46:00.000000000 +0800
++++ mplayer-20070622/libaf/af_center.c 2007-08-04 17:53:19.000000000 +0800
+@@ -13,6 +13,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "af.h"
+
+diff -urN -x .git mplayer.orig/libaf/af_channels.c mplayer-20070622/libaf/af_channels.c
+--- mplayer.orig/libaf/af_channels.c 2007-03-20 17:53:31.000000000 +0800
++++ mplayer-20070622/libaf/af_channels.c 2007-08-04 17:53:19.000000000 +0800
+@@ -5,6 +5,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "af.h"
+diff -urN -x .git mplayer.orig/libaf/af_comp.c mplayer-20070622/libaf/af_comp.c
+--- mplayer.orig/libaf/af_comp.c 2007-03-20 17:53:31.000000000 +0800
++++ mplayer-20070622/libaf/af_comp.c 2007-08-04 17:53:19.000000000 +0800
+@@ -11,6 +11,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include <inttypes.h>
+ #include <math.h>
+diff -urN -x .git mplayer.orig/libaf/af_delay.c mplayer-20070622/libaf/af_delay.c
+--- mplayer.orig/libaf/af_delay.c 2007-03-20 17:46:00.000000000 +0800
++++ mplayer-20070622/libaf/af_delay.c 2007-08-04 17:53:19.000000000 +0800
+@@ -5,6 +5,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "af.h"
+diff -urN -x .git mplayer.orig/libaf/af_dummy.c mplayer-20070622/libaf/af_dummy.c
+--- mplayer.orig/libaf/af_dummy.c 2007-03-20 17:46:00.000000000 +0800
++++ mplayer-20070622/libaf/af_dummy.c 2007-08-04 17:53:19.000000000 +0800
+@@ -3,6 +3,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "af.h"
+
+diff -urN -x .git mplayer.orig/libaf/af_export.c mplayer-20070622/libaf/af_export.c
+--- mplayer.orig/libaf/af_export.c 2007-03-19 18:13:33.000000000 +0800
++++ mplayer-20070622/libaf/af_export.c 2007-08-04 17:53:19.000000000 +0800
+@@ -10,6 +10,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <unistd.h>
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libaf/af_extrastereo.c mplayer-20070622/libaf/af_extrastereo.c
+--- mplayer.orig/libaf/af_extrastereo.c 2007-03-20 17:53:31.000000000 +0800
++++ mplayer-20070622/libaf/af_extrastereo.c 2007-08-04 17:53:19.000000000 +0800
+@@ -11,6 +11,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include <inttypes.h>
+ #include <math.h>
+diff -urN -x .git mplayer.orig/libaf/af_format.c mplayer-20070622/libaf/af_format.c
+--- mplayer.orig/libaf/af_format.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libaf/af_format.c 2007-08-04 17:53:19.000000000 +0800
+@@ -9,6 +9,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <limits.h>
+
+diff -urN -x .git mplayer.orig/libaf/af_gate.c mplayer-20070622/libaf/af_gate.c
+--- mplayer.orig/libaf/af_gate.c 2007-03-20 17:53:31.000000000 +0800
++++ mplayer-20070622/libaf/af_gate.c 2007-08-04 17:53:19.000000000 +0800
+@@ -11,6 +11,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include <inttypes.h>
+ #include <math.h>
+diff -urN -x .git mplayer.orig/libaf/af_hrtf.c mplayer-20070622/libaf/af_hrtf.c
+--- mplayer.orig/libaf/af_hrtf.c 2007-03-20 17:53:31.000000000 +0800
++++ mplayer-20070622/libaf/af_hrtf.c 2007-08-04 17:53:19.000000000 +0800
+@@ -5,6 +5,7 @@
+ //#include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include <math.h>
+diff -urN -x .git mplayer.orig/libaf/af_karaoke.c mplayer-20070622/libaf/af_karaoke.c
+--- mplayer.orig/libaf/af_karaoke.c 2007-03-20 17:46:00.000000000 +0800
++++ mplayer-20070622/libaf/af_karaoke.c 2007-08-04 17:53:19.000000000 +0800
+@@ -10,6 +10,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "af.h"
+
+diff -urN -x .git mplayer.orig/libaf/af_ladspa.c mplayer-20070622/libaf/af_ladspa.c
+--- mplayer.orig/libaf/af_ladspa.c 2007-03-20 17:53:31.000000000 +0800
++++ mplayer-20070622/libaf/af_ladspa.c 2007-08-04 17:53:19.000000000 +0800
+@@ -62,6 +62,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include <inttypes.h>
+ #include <math.h>
+diff -urN -x .git mplayer.orig/libaf/af_lavcresample.c mplayer-20070622/libaf/af_lavcresample.c
+--- mplayer.orig/libaf/af_lavcresample.c 2007-03-22 09:50:04.000000000 +0800
++++ mplayer-20070622/libaf/af_lavcresample.c 2007-08-04 17:53:19.000000000 +0800
+@@ -4,6 +4,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libaf/af_sinesuppress.c mplayer-20070622/libaf/af_sinesuppress.c
+--- mplayer.orig/libaf/af_sinesuppress.c 2007-03-20 17:53:31.000000000 +0800
++++ mplayer-20070622/libaf/af_sinesuppress.c 2007-08-04 17:53:20.000000000 +0800
+@@ -12,6 +12,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include <inttypes.h>
+ #include <math.h>
+diff -urN -x .git mplayer.orig/libaf/af_sub.c mplayer-20070622/libaf/af_sub.c
+--- mplayer.orig/libaf/af_sub.c 2007-03-20 17:46:00.000000000 +0800
++++ mplayer-20070622/libaf/af_sub.c 2007-08-04 17:53:20.000000000 +0800
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "af.h"
+ #include "dsp.h"
+diff -urN -x .git mplayer.orig/libaf/af_surround.c mplayer-20070622/libaf/af_surround.c
+--- mplayer.orig/libaf/af_surround.c 2007-03-20 17:53:31.000000000 +0800
++++ mplayer-20070622/libaf/af_surround.c 2007-08-04 17:53:20.000000000 +0800
+@@ -36,6 +36,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "af.h"
+ #include "dsp.h"
+diff -urN -x .git mplayer.orig/libaf/af_sweep.c mplayer-20070622/libaf/af_sweep.c
+--- mplayer.orig/libaf/af_sweep.c 2007-03-20 17:46:00.000000000 +0800
++++ mplayer-20070622/libaf/af_sweep.c 2007-08-04 17:53:20.000000000 +0800
+@@ -4,6 +4,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <math.h>
+
+diff -urN -x .git mplayer.orig/libaf/af_tools.c mplayer-20070622/libaf/af_tools.c
+--- mplayer.orig/libaf/af_tools.c 2005-01-31 19:34:49.000000000 +0800
++++ mplayer-20070622/libaf/af_tools.c 2007-08-04 17:53:20.000000000 +0800
+@@ -1,5 +1,6 @@
+ #include <math.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <af.h>
+
+ /* Convert to gain value from dB. Returns AF_OK if of and AF_ERROR if
+diff -urN -x .git mplayer.orig/libaf/af_volnorm.c mplayer-20070622/libaf/af_volnorm.c
+--- mplayer.orig/libaf/af_volnorm.c 2007-03-20 17:53:31.000000000 +0800
++++ mplayer-20070622/libaf/af_volnorm.c 2007-08-04 17:53:20.000000000 +0800
+@@ -11,6 +11,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include <inttypes.h>
+ #include <math.h>
+diff -urN -x .git mplayer.orig/libaf/af_volume.c mplayer-20070622/libaf/af_volume.c
+--- mplayer.orig/libaf/af_volume.c 2007-03-20 17:53:31.000000000 +0800
++++ mplayer-20070622/libaf/af_volume.c 2007-08-04 17:53:20.000000000 +0800
+@@ -27,6 +27,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include <inttypes.h>
+ #include <math.h>
+diff -urN -x .git mplayer.orig/libaf/filter.c mplayer-20070622/libaf/filter.c
+--- mplayer.orig/libaf/filter.c 2006-07-09 11:59:52.000000000 +0800
++++ mplayer-20070622/libaf/filter.c 2007-08-04 17:53:20.000000000 +0800
+@@ -12,6 +12,7 @@
+
+ */
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <math.h>
+ #include "dsp.h"
+
+diff -urN -x .git mplayer.orig/libaf/format.c mplayer-20070622/libaf/format.c
+--- mplayer.orig/libaf/format.c 2007-03-20 17:53:31.000000000 +0800
++++ mplayer-20070622/libaf/format.c 2007-08-04 17:53:20.000000000 +0800
+@@ -11,6 +11,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <limits.h>
+
+diff -urN -x .git mplayer.orig/libao2/ao_alsa.c mplayer-20070622/libao2/ao_alsa.c
+--- mplayer.orig/libao2/ao_alsa.c 2007-02-10 03:49:31.000000000 +0800
++++ mplayer-20070622/libao2/ao_alsa.c 2007-08-04 17:53:20.000000000 +0800
+@@ -19,6 +19,7 @@
+ #include <ctype.h>
+ #include <math.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "subopt-helper.h"
+diff -urN -x .git mplayer.orig/libao2/ao_esd.c mplayer-20070622/libao2/ao_esd.c
+--- mplayer.orig/libao2/ao_esd.c 2006-07-10 00:01:36.000000000 +0800
++++ mplayer-20070622/libao2/ao_esd.c 2007-08-04 17:53:20.000000000 +0800
+@@ -21,6 +21,7 @@
+ #include <sys/socket.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+ #include <errno.h>
+ #include <fcntl.h>
+diff -urN -x .git mplayer.orig/libao2/ao_jack.c mplayer-20070622/libao2/ao_jack.c
+--- mplayer.orig/libao2/ao_jack.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libao2/ao_jack.c 2007-08-04 17:53:21.000000000 +0800
+@@ -11,6 +11,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libao2/ao_macosx.c mplayer-20070622/libao2/ao_macosx.c
+--- mplayer.orig/libao2/ao_macosx.c 2007-05-28 16:42:35.000000000 +0800
++++ mplayer-20070622/libao2/ao_macosx.c 2007-08-04 17:53:21.000000000 +0800
+@@ -42,6 +42,7 @@
+ #include <AudioToolbox/AudioToolbox.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <stdlib.h>
+ #include <inttypes.h>
+ #include <pthread.h>
+diff -urN -x .git mplayer.orig/libao2/ao_mpegpes.c mplayer-20070622/libao2/ao_mpegpes.c
+--- mplayer.orig/libao2/ao_mpegpes.c 2006-08-12 01:10:57.000000000 +0800
++++ mplayer-20070622/libao2/ao_mpegpes.c 2007-08-04 17:53:21.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+diff -urN -x .git mplayer.orig/libao2/ao_nas.c mplayer-20070622/libao2/ao_nas.c
+--- mplayer.orig/libao2/ao_nas.c 2007-04-20 00:28:59.000000000 +0800
++++ mplayer-20070622/libao2/ao_nas.c 2007-08-04 17:53:21.000000000 +0800
+@@ -30,6 +30,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <pthread.h>
+ #include <limits.h>
+ #include <audio/audiolib.h>
+diff -urN -x .git mplayer.orig/libao2/ao_oss.c mplayer-20070622/libao2/ao_oss.c
+--- mplayer.orig/libao2/ao_oss.c 2006-12-10 08:21:35.000000000 +0800
++++ mplayer-20070622/libao2/ao_oss.c 2007-08-04 17:53:21.000000000 +0800
+@@ -9,6 +9,7 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libao2/ao_pcm.c mplayer-20070622/libao2/ao_pcm.c
+--- mplayer.orig/libao2/ao_pcm.c 2006-12-07 19:58:07.000000000 +0800
++++ mplayer-20070622/libao2/ao_pcm.c 2007-08-04 17:53:21.000000000 +0800
+@@ -3,6 +3,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "libavutil/common.h"
+ #include "mpbswap.h"
+diff -urN -x .git mplayer.orig/libao2/ao_polyp.c mplayer-20070622/libao2/ao_polyp.c
+--- mplayer.orig/libao2/ao_polyp.c 2007-02-06 07:46:08.000000000 +0800
++++ mplayer-20070622/libao2/ao_polyp.c 2007-08-04 17:53:21.000000000 +0800
+@@ -1,5 +1,6 @@
+ #include <assert.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include <polyp/polyplib.h>
+ #include <polyp/polyplib-error.h>
+diff -urN -x .git mplayer.orig/libao2/ao_sdl.c mplayer-20070622/libao2/ao_sdl.c
+--- mplayer.orig/libao2/ao_sdl.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libao2/ao_sdl.c 2007-08-04 17:53:21.000000000 +0800
+@@ -13,6 +13,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libao2/ao_sun.c mplayer-20070622/libao2/ao_sun.c
+--- mplayer.orig/libao2/ao_sun.c 2007-05-20 20:20:03.000000000 +0800
++++ mplayer-20070622/libao2/ao_sun.c 2007-08-04 17:53:21.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include <unistd.h>
+ #include <fcntl.h>
+diff -urN -x .git mplayer.orig/libao2/audio_out.c mplayer-20070622/libao2/audio_out.c
+--- mplayer.orig/libao2/audio_out.c 2006-08-17 04:04:43.000000000 +0800
++++ mplayer-20070622/libao2/audio_out.c 2007-08-04 17:53:21.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "audio_out.h"
+diff -urN -x .git mplayer.orig/libass/ass_bitmap.c mplayer-20070622/libass/ass_bitmap.c
+--- mplayer.orig/libass/ass_bitmap.c 2007-04-02 05:59:54.000000000 +0800
++++ mplayer-20070622/libass/ass_bitmap.c 2007-08-04 17:53:21.000000000 +0800
+@@ -20,6 +20,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <math.h>
+ #include <assert.h>
+ #include <ft2build.h>
+diff -urN -x .git mplayer.orig/libass/ass.c mplayer-20070622/libass/ass.c
+--- mplayer.orig/libass/ass.c 2007-06-16 06:22:16.000000000 +0800
++++ mplayer-20070622/libass/ass.c 2007-08-04 17:53:21.000000000 +0800
+@@ -23,6 +23,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <assert.h>
+ #include <errno.h>
+ #include <sys/types.h>
+diff -urN -x .git mplayer.orig/libass/ass_fontconfig.c mplayer-20070622/libass/ass_fontconfig.c
+--- mplayer.orig/libass/ass_fontconfig.c 2007-05-04 04:10:14.000000000 +0800
++++ mplayer-20070622/libass/ass_fontconfig.c 2007-08-04 17:53:21.000000000 +0800
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <assert.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <inttypes.h>
+diff -urN -x .git mplayer.orig/libass/ass_library.c mplayer-20070622/libass/ass_library.c
+--- mplayer.orig/libass/ass_library.c 2006-12-06 18:11:23.000000000 +0800
++++ mplayer-20070622/libass/ass_library.c 2007-08-04 17:53:22.000000000 +0800
+@@ -22,6 +22,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "ass.h"
+ #include "ass_library.h"
+diff -urN -x .git mplayer.orig/libass/ass_mp.c mplayer-20070622/libass/ass_mp.c
+--- mplayer.orig/libass/ass_mp.c 2007-05-19 22:11:41.000000000 +0800
++++ mplayer-20070622/libass/ass_mp.c 2007-08-04 17:53:22.000000000 +0800
+@@ -20,6 +20,7 @@
+
+ #include <inttypes.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <stdlib.h>
+
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libavcodec/aasc.c mplayer-20070622/libavcodec/aasc.c
+--- mplayer.orig/libavcodec/aasc.c 2007-05-10 17:00:44.000000000 +0800
++++ mplayer-20070622/libavcodec/aasc.c 2007-08-04 17:53:22.000000000 +0800
+@@ -27,6 +27,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "avcodec.h"
+ #include "dsputil.h"
+diff -urN -x .git mplayer.orig/libavcodec/apiexample.c mplayer-20070622/libavcodec/apiexample.c
+--- mplayer.orig/libavcodec/apiexample.c 2007-06-13 16:28:00.000000000 +0800
++++ mplayer-20070622/libavcodec/apiexample.c 2007-08-04 17:53:23.000000000 +0800
+@@ -30,6 +30,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <math.h>
+
+ #define PI 3.14159265358979323846
+diff -urN -x .git mplayer.orig/libavcodec/cabac.c mplayer-20070622/libavcodec/cabac.c
+--- mplayer.orig/libavcodec/cabac.c 2006-10-18 17:37:25.000000000 +0800
++++ mplayer-20070622/libavcodec/cabac.c 2007-08-04 17:53:24.000000000 +0800
+@@ -26,6 +26,7 @@
+ */
+
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "common.h"
+ #include "bitstream.h"
+diff -urN -x .git mplayer.orig/libavcodec/cinepak.c mplayer-20070622/libavcodec/cinepak.c
+--- mplayer.orig/libavcodec/cinepak.c 2007-05-10 17:00:44.000000000 +0800
++++ mplayer-20070622/libavcodec/cinepak.c 2007-08-04 17:53:24.000000000 +0800
+@@ -33,6 +33,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include "avcodec.h"
+diff -urN -x .git mplayer.orig/libavcodec/cyuv.c mplayer-20070622/libavcodec/cyuv.c
+--- mplayer.orig/libavcodec/cyuv.c 2007-05-10 17:00:44.000000000 +0800
++++ mplayer-20070622/libavcodec/cyuv.c 2007-08-04 17:53:24.000000000 +0800
+@@ -33,6 +33,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include "avcodec.h"
+diff -urN -x .git mplayer.orig/libavcodec/dct-test.c mplayer-20070622/libavcodec/dct-test.c
+--- mplayer.orig/libavcodec/dct-test.c 2007-06-12 17:29:25.000000000 +0800
++++ mplayer-20070622/libavcodec/dct-test.c 2007-08-04 17:53:25.000000000 +0800
+@@ -28,6 +28,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/time.h>
+ #include <unistd.h>
+ #include <math.h>
+diff -urN -x .git mplayer.orig/libavcodec/dsputil.c mplayer-20070622/libavcodec/dsputil.c
+--- mplayer.orig/libavcodec/dsputil.c 2007-08-04 14:58:30.000000000 +0800
++++ mplayer-20070622/libavcodec/dsputil.c 2007-08-04 17:53:26.000000000 +0800
@@ -33,7 +33,7 @@
#include "simple_idct.h"
#include "faandct.h"
@@ -10,37 +811,55 @@ diff -urN mplayer-20070622.orig/libavcodec/dsputil.c mplayer-20070622/libavcodec
/* snow.c */
void ff_spatial_dwt(int *buffer, int width, int height, int stride, int type, int decomposition_count);
-@@ -3753,12 +3753,14 @@
+@@ -3753,12 +3753,12 @@
converted */
static void ff_jref_idct_put(uint8_t *dest, int line_size, DCTELEM *block)
{
- j_rev_dct (block);
-- put_pixels_clamped_c(block, dest, line_size);
-+// j_rev_dct (block);
-+ ff_godson2c_idct(block);
-+ put_pixels_clamped_c(block, dest, line_size);
++ ff_godson2c_idct(block);
+ put_pixels_clamped_c(block, dest, line_size);
}
static void ff_jref_idct_add(uint8_t *dest, int line_size, DCTELEM *block)
{
- j_rev_dct (block);
-+// j_rev_dct (block);
+ ff_godson2c_idct(block);
add_pixels_clamped_c(block, dest, line_size);
}
-@@ -3865,7 +3867,8 @@
+@@ -3865,7 +3865,7 @@
c->idct_put= ff_h264_lowres_idct_put_c;
c->idct_add= ff_h264_lowres_idct_add_c;
}
- c->idct = j_rev_dct4;
-+ // c->idct = j_rev_dct4;
+ c->idct = ff_godson2c_idct;
c->idct_permutation_type= FF_NO_IDCT_PERM;
}else if(avctx->lowres==2){
c->idct_put= ff_jref_idct2_put;
-diff -urN mplayer-20070622.orig/libavcodec/faaccfg.h mplayer-20070622/libavcodec/faaccfg.h
---- mplayer-20070622.orig/libavcodec/faaccfg.h 1970-01-01 08:00:00.000000000 +0800
-+++ mplayer-20070622/libavcodec/faaccfg.h 2007-08-04 07:23:17.000000000 +0800
+diff -urN -x .git mplayer.orig/libavcodec/elbg.c mplayer-20070622/libavcodec/elbg.c
+--- mplayer.orig/libavcodec/elbg.c 2007-06-11 15:57:15.000000000 +0800
++++ mplayer-20070622/libavcodec/elbg.c 2007-08-04 17:53:26.000000000 +0800
+@@ -24,6 +24,7 @@
+ */
+
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "elbg.h"
+ #include "avcodec.h"
+diff -urN -x .git mplayer.orig/libavcodec/eval.c mplayer-20070622/libavcodec/eval.c
+--- mplayer.orig/libavcodec/eval.c 2007-02-25 18:27:12.000000000 +0800
++++ mplayer-20070622/libavcodec/eval.c 2007-08-04 17:53:27.000000000 +0800
+@@ -36,6 +36,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <math.h>
+
+ #ifndef NAN
+diff -urN -x .git mplayer.orig/libavcodec/faaccfg.h mplayer-20070622/libavcodec/faaccfg.h
+--- mplayer.orig/libavcodec/faaccfg.h 1970-01-01 08:00:00.000000000 +0800
++++ mplayer-20070622/libavcodec/faaccfg.h 2007-08-04 17:53:27.000000000 +0800
@@ -0,0 +1,122 @@
+/*
+ * FAAC - Freeware Advanced Audio Coder
@@ -164,9 +983,9 @@ diff -urN mplayer-20070622.orig/libavcodec/faaccfg.h mplayer-20070622/libavcodec
+#pragma pack(pop)
+
+#endif /* _FAACCFG_H_ */
-diff -urN mplayer-20070622.orig/libavcodec/faac.h mplayer-20070622/libavcodec/faac.h
---- mplayer-20070622.orig/libavcodec/faac.h 1970-01-01 08:00:00.000000000 +0800
-+++ mplayer-20070622/libavcodec/faac.h 2007-08-04 07:23:17.000000000 +0800
+diff -urN -x .git mplayer.orig/libavcodec/faac.h mplayer-20070622/libavcodec/faac.h
+--- mplayer.orig/libavcodec/faac.h 1970-01-01 08:00:00.000000000 +0800
++++ mplayer-20070622/libavcodec/faac.h 2007-08-04 17:53:27.000000000 +0800
@@ -0,0 +1,95 @@
+/*
+ * FAAC - Freeware Advanced Audio Coder
@@ -263,10 +1082,43 @@ diff -urN mplayer-20070622.orig/libavcodec/faac.h mplayer-20070622/libavcodec/fa
+#endif /* __cplusplus */
+
+#endif /* _FAAC_H_ */
-diff -urN mplayer-20070622.orig/libavcodec/idct.c mplayer-20070622/libavcodec/idct.c
---- mplayer-20070622.orig/libavcodec/idct.c 1970-01-01 08:00:00.000000000 +0800
-+++ mplayer-20070622/libavcodec/idct.c 2007-08-04 07:23:17.000000000 +0800
-@@ -0,0 +1,798 @@
+diff -urN -x .git mplayer.orig/libavcodec/fft-test.c mplayer-20070622/libavcodec/fft-test.c
+--- mplayer.orig/libavcodec/fft-test.c 2007-06-10 01:52:16.000000000 +0800
++++ mplayer-20070622/libavcodec/fft-test.c 2007-08-04 17:53:27.000000000 +0800
+@@ -29,6 +29,7 @@
+ #include <sys/time.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #undef exit
+
+diff -urN -x .git mplayer.orig/libavcodec/flicvideo.c mplayer-20070622/libavcodec/flicvideo.c
+--- mplayer.orig/libavcodec/flicvideo.c 2007-06-16 22:52:12.000000000 +0800
++++ mplayer-20070622/libavcodec/flicvideo.c 2007-08-04 17:53:27.000000000 +0800
+@@ -39,6 +39,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include "avcodec.h"
+diff -urN -x .git mplayer.orig/libavcodec/idcinvideo.c mplayer-20070622/libavcodec/idcinvideo.c
+--- mplayer.orig/libavcodec/idcinvideo.c 2007-05-10 17:00:44.000000000 +0800
++++ mplayer-20070622/libavcodec/idcinvideo.c 2007-08-04 17:53:30.000000000 +0800
+@@ -48,6 +48,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include "avcodec.h"
+diff -urN -x .git mplayer.orig/libavcodec/idct.c mplayer-20070622/libavcodec/idct.c
+--- mplayer.orig/libavcodec/idct.c 1970-01-01 08:00:00.000000000 +0800
++++ mplayer-20070622/libavcodec/idct.c 2007-08-04 17:53:30.000000000 +0800
+@@ -0,0 +1,345 @@
+/*
+ * idct_mmx.c
+ * Copyright (C) 2000-2003 Michel Lespinasse <walken@zoy.org>
@@ -289,19 +1141,9 @@ diff -urN mplayer-20070622.orig/libavcodec/idct.c mplayer-20070622/libavcodec/id
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
-+/*
-+#include "config.h"
-+
-+
-+#include <inttypes.h>
-+
-+#include "mpeg2.h"
-+#include "attributes.h"
-+#include "mpeg2_internal.h"*/
+#include "common.h"
+#include "dsputil.h"
+#include "idct.h"
-+//#include "mmx.h"
+
+
+#define ATTR_ALIGN(align) __attribute__ ((__aligned__ (align)))
@@ -313,54 +1155,6 @@ diff -urN mplayer-20070622.orig/libavcodec/idct.c mplayer-20070622/libavcodec/id
+#define round(bias) ((int)(((bias)+0.5) * (1<<ROW_SHIFT)))
+#define rounder(bias) {round (bias), round (bias)}
+
-+/* idct main entry point */
-+//void (* mpeg2_idct_copy) (int16_t * block, uint8_t * dest, int stride);
-+//void (* mpeg2_idct_add) (int last, int16_t * block,
-+// uint8_t * dest, int stride);
-+
-+//int flag=0;
-+//int flag_block_copy=8;
-+//int flag_block_add_DC=8;
-+#if 0
-+/* C row IDCT - its just here to document the MMXEXT and MMX versions */
-+static inline void idct_row (int16_t * row, int offset,
-+ int16_t * table, int32_t * rounder)
-+{
-+ int C1, C2, C3, C4, C5, C6, C7;
-+ int a0, a1, a2, a3, b0, b1, b2, b3;
-+
-+ row += offset;
-+
-+ C1 = table[1];
-+ C2 = table[2];
-+ C3 = table[3];
-+ C4 = table[4];
-+ C5 = table[5];
-+ C6 = table[6];
-+ C7 = table[7];
-+
-+ a0 = C4*row[0] + C2*row[2] + C4*row[4] + C6*row[6] + *rounder;
-+ a1 = C4*row[0] + C6*row[2] - C4*row[4] - C2*row[6] + *rounder;
-+ a2 = C4*row[0] - C6*row[2] - C4*row[4] + C2*row[6] + *rounder;
-+ a3 = C4*row[0] - C2*row[2] + C4*row[4] - C6*row[6] + *rounder;
-+
-+ b0 = C1*row[1] + C3*row[3] + C5*row[5] + C7*row[7];
-+ b1 = C3*row[1] - C7*row[3] - C1*row[5] - C5*row[7];
-+ b2 = C5*row[1] - C1*row[3] + C7*row[5] + C3*row[7];
-+ b3 = C7*row[1] - C5*row[3] + C3*row[5] - C1*row[7];
-+
-+ row[0] = (a0 + b0) >> ROW_SHIFT;
-+ row[1] = (a1 + b1) >> ROW_SHIFT;
-+ row[2] = (a2 + b2) >> ROW_SHIFT;
-+ row[3] = (a3 + b3) >> ROW_SHIFT;
-+ row[4] = (a3 - b3) >> ROW_SHIFT;
-+ row[5] = (a2 - b2) >> ROW_SHIFT;
-+ row[6] = (a1 - b1) >> ROW_SHIFT;
-+ row[7] = (a0 - b0) >> ROW_SHIFT;
-+}
-+#endif
-+
-+
+#define godson2c_table(c1,c2,c3,c4,c5,c6,c7) { c4,c2,-c4,-c2, \
+ c4,c6,c4,c6, \
+ c1,c3,-c1,-c5,\
@@ -370,24 +1164,6 @@ diff -urN mplayer-20070622.orig/libavcodec/idct.c mplayer-20070622/libavcodec/id
+ c5,-c1,c3,-c1, \
+ c7,c3,c7,-c5 }
+
-+
-+
-+/*static inline void godson2c_row_head(int16_t * const row, const int offset,
-+ const int16_t * const table)
-+{
-+ asm(".set\tmips3"::);
-+ asm("ldc1 $f6,%0;"::"m"(*(row+offset)));
-+ asm("ldc1 $f14,%0;"::"m"(*(row+offset+4)));
-+ asm("mov.d $f4,$f6;");
-+ asm("ldc1 $f2,%0;"::"m"(*table));
-+ asm("mov.d $f10,$f14;");
-+ asm("ldc1 $f8,%0;"::"m"(*(table+4)));
-+ asm("pmaddhw $f2,$f2,$f4;");
-+ asm("dli $12,%0;"::"i"(0x4e));
-+ asm("dmtc1 $12,$f16;");
-+ asm("pshufh $f6,$f6,$f16;");
-+ asm(".set\tmips2"::);
-+}*/
+
+static inline void godson2c_row_head(int16_t * const row, const int offset,
+ const int16_t * const table)
@@ -411,66 +1187,8 @@ diff -urN mplayer-20070622.orig/libavcodec/idct.c mplayer-20070622/libavcodec/id
+ :"m"(*(row+offset)),"m"(*(row+offset+4)),"m"(*table),"m"(*(table+4)),"i"(0x4e)
+ :"$f2","$f4","$f6","$f8","$f10","$f14","$f16","$12"
+ );
-+ #if 0
-+ asm(".set\tmips3"::);
-+ asm("ldc1 $f6,%0;"::"m"(*(row+offset)));
-+ asm("ldc1 $f14,%0;"::"m"(*(row+offset+4)));
-+ asm("ldc1 $f2,%0;"::"m"(*table));
-+ asm("ldc1 $f8,%0;"::"m"(*(table+4)));
-+ asm("dli $12,%0;"::"i"(0x4e));
-+ asm("dmtc1 $12,$f16;");
-+ asm("mov.d $f4,$f6;");
-+ asm("mov.d $f10,$f14;");
-+ asm("pmaddhw $f2,$f2,$f4;");
-+ asm("pshufh $f6,$f6,$f16;");
-+ asm(".set\tmips2"::);
-+ #endif
+}
+
-+/*static inline void godson2c_row(const int16_t * const table,
-+ const int32_t * const rounder)
-+{
-+ asm(".set\tmips3"::);
-+ asm("ldc1 $f0,%0;"::"m"(*(table+8)));
-+ asm("pmaddhw $f8,$f8,$f6;");
-+ asm("ldc1 $f16,%0;"::"m"(*(table+16)));
-+ asm("pmaddhw $f4,$f4,$f16;");
-+ asm("dli $13,%0;"::"i"(0x4e));
-+ asm("dmtc1 $13,$f16;");
-+ asm("pshufh $f10,$f10,$f16;");
-+ asm("ldc1 $f20,%0;"::"m"(*(table+12)));
-+ asm("pmaddhw $f0,$f0,$f14;");
-+ asm("ldc1 $f22,%0;"::"m"(*rounder));
-+ asm("paddw $f2,$f2,$f22;");
-+ asm("pmaddhw $f20,$f20,$f10;");
-+ asm("ldc1 $f16,%0;"::"m"(*(table+20)));
-+ asm("pmaddhw $f6,$f6,$f16;");
-+ asm("paddw $f2,$f2,$f8;");
-+ asm("ldc1 $f22,%0;"::"m"(*(table+24)));
-+ asm("pmaddhw $f14,$f14,$f22;");
-+ asm("mov.d $f8,$f2;");
-+ asm("ldc1 $f16,%0;"::"m"(*(table+28)));
-+ asm("pmaddhw $f10,$f10,$f16;");
-+ asm("paddw $f0,$f0,$f20;");
-+ asm("ldc1 $f22,%0;"::"m"(*rounder));
-+ asm("paddw $f4,$f4,$f22;");
-+ asm("psubw $f2,$f2,$f0;");
-+ asm("dli $12,%0;"::"i"(ROW_SHIFT));
-+ asm("dmtc1 $12,$f16;");
-+ asm("psraw $f2,$f2,$f16;");
-+ asm("paddw $f0,$f0,$f8;");
-+ asm("paddw $f4,$f4,$f6;");
-+
-+ asm("psraw $f0,$f0,$f16;");
-+ asm("paddw $f14,$f14,$f10;");
-+
-+ asm("mov.d $f8,$f4;");
-+ asm("paddw $f4,$f4,$f14;");
-+ asm("psubw $f8,$f8,$f14;");
-+ asm(".set\tmips2"::);
-+}*/
-+
-+
+static inline void godson2c_row(const int16_t * const table,
+ const int32_t * const rounder)
+{
@@ -687,80 +1405,6 @@ diff -urN mplayer-20070622.orig/libavcodec/idct.c mplayer-20070622/libavcodec/id
+ );
+}
+
-+#if 0
-+/* C column IDCT - its just here to document the MMXEXT and MMX versions */
-+static inline void idct_col (int16_t * col, int offset)
-+{
-+/* multiplication - as implemented on mmx */
-+#define F(c,x) (((c) * (x)) >> 16)
-+
-+/* saturation - it helps us handle torture test cases */
-+#define S(x) (((x)>32767) ? 32767 : ((x)<-32768) ? -32768 : (x))
-+
-+ int16_t x0, x1, x2, x3, x4, x5, x6, x7;
-+ int16_t y0, y1, y2, y3, y4, y5, y6, y7;
-+ int16_t a0, a1, a2, a3, b0, b1, b2, b3;
-+ int16_t u04, v04, u26, v26, u17, v17, u35, v35, u12, v12;
-+
-+ col += offset;
-+
-+ x0 = col[0*8];
-+ x1 = col[1*8];
-+ x2 = col[2*8];
-+ x3 = col[3*8];
-+ x4 = col[4*8];
-+ x5 = col[5*8];
-+ x6 = col[6*8];
-+ x7 = col[7*8];
-+
-+ u04 = S (x0 + x4);
-+ v04 = S (x0 - x4);
-+ u26 = S (F (T2, x6) + x2);
-+ v26 = S (F (T2, x2) - x6);
-+
-+ a0 = S (u04 + u26);
-+ a1 = S (v04 + v26);
-+ a2 = S (v04 - v26);
-+ a3 = S (u04 - u26);
-+
-+ u17 = S (F (T1, x7) + x1);
-+ v17 = S (F (T1, x1) - x7);
-+ u35 = S (F (T3, x5) + x3);
-+ v35 = S (F (T3, x3) - x5);
-+
-+ b0 = S (u17 + u35);
-+ b3 = S (v17 - v35);
-+ u12 = S (u17 - u35);
-+ v12 = S (v17 + v35);
-+ u12 = S (2 * F (C4, u12));
-+ v12 = S (2 * F (C4, v12));
-+ b1 = S (u12 + v12);
-+ b2 = S (u12 - v12);
-+
-+ y0 = S (a0 + b0) >> COL_SHIFT;
-+ y1 = S (a1 + b1) >> COL_SHIFT;
-+ y2 = S (a2 + b2) >> COL_SHIFT;
-+ y3 = S (a3 + b3) >> COL_SHIFT;
-+
-+ y4 = S (a3 - b3) >> COL_SHIFT;
-+ y5 = S (a2 - b2) >> COL_SHIFT;
-+ y6 = S (a1 - b1) >> COL_SHIFT;
-+ y7 = S (a0 - b0) >> COL_SHIFT;
-+
-+ col[0*8] = y0;
-+ col[1*8] = y1;
-+ col[2*8] = y2;
-+ col[3*8] = y3;
-+ col[4*8] = y4;
-+ col[5*8] = y5;
-+ col[6*8] = y6;
-+ col[7*8] = y7;
-+}
-+#endif
-+
-+
-+
-+
+static const int32_t rounder0[] ATTR_ALIGN(8) =
+ rounder ((1 << (COL_SHIFT - 1)) - 0.5);
+static const int32_t rounder4[] ATTR_ALIGN(8) = rounder (0);
@@ -816,263 +1460,40 @@ diff -urN mplayer-20070622.orig/libavcodec/idct.c mplayer-20070622/libavcodec/id
+ idct_col (block, 4); \
+}
+
-+/*#define COPY_GODSON2C(offset,r0,r1,r2) \
-+do { \
-+ asm("ldc1 " #r0 ",%0;"::"m"(*(block+offset))); \
-+ dest+=stride; \
-+ asm("ldc1 " #r1 ",%0;"::"m"(*(block+offset+4))); \
-+ asm("sdc1 " #r2 ",%0;":"=m"(*dest)); \
-+\
-+ asm("packushb " #r0 "," #r0 "," #r1 ";"); \
-+} while (0)*/
-+
-+/*static inline void block_copy(int16_t * const block, uint8_t * dest,
-+ const int stride)
-+{
-+ int i;
-+
-+ asm("ldc1 $f4,%0;"::"m"(*(block+0*8)));
-+ asm("ldc1 $f0,%0;"::"m"(*(block+0*8+4)));
-+ asm("ldc1 $f6,%0;"::"m"(*(block+1*8)));
-+ asm("packushb $f4,$f4,$f0;");
-+ asm("ldc1 $f2,%0;"::"m"(*(block+1*8+4)));
-+ asm("sdc1 $f4,%0;":"=m"(*dest));
-+
-+
-+ asm("packushb $f6,$f6,$f2;");
-+ COPY_GODSON2C (2*8, $f4, $f0, $f6);
-+ COPY_GODSON2C (3*8, $f6, $f2, $f4);
-+ COPY_GODSON2C (4*8, $f4, $f0, $f6);
-+ COPY_GODSON2C (5*8, $f6, $f2, $f4);
-+ COPY_GODSON2C (6*8, $f4, $f0, $f6);
-+ COPY_GODSON2C (7*8, $f6, $f2, $f4);
-+ asm("sdc1 $f6,%0;":"=m"(*(dest+stride)));
-+}*/
-+/*#define ADD_GODSON2C(offset,r1,r2,r3,r4) \
-+do { \
-+ asm("ldc1 " #r1 ",%0;"::"m"(*(dest+2*stride))); \
-+ asm("packushb " #r3 "," #r3 "," #r4 ";"); \
-+ asm("mov.d " #r2 "," #r1 ";"); \
-+ dest+=stride; \
-+ asm("sdc1 " #r3 ",%0;":"=m"(*dest)); \
-+ asm("punpcklbh " #r1 "," #r1 ",$f4;"); \
-+ asm("ldc1 $f16,%0;"::"m"(*(block+offset)));\
-+ asm("paddsh " #r1 "," #r1 ",$f16;"); \
-+ asm("punpckhbh " #r2 "," #r2 ",$f4;"); \
-+ asm("ldc1 $f22,%0;"::"m"(*(block+offset+4))); \
-+ asm("paddsh " #r2 "," #r2 ",$f22;"); \
-+} while (0)*/
-+
-+/*static inline void block_add(int16_t * const block, uint8_t * dest,
-+ const int stride)
-+{
-+ asm("ldc1 $f0,%0;"::"m"(*dest));
-+ asm("fxor $f4,$f4,$f4;");
-+ asm("ldc1 $f2,%0;"::"m"(*(dest+stride)));
-+ asm("mov.d $f6,$f0;");
-+ asm("punpcklbh $f0,$f0,$f4;");
-+ asm("mov.d $f8,$f2;");
-+ asm("ldc1 $f16,%0;"::"m"(*(block+0*8)));
-+ asm("paddsh $f0,$f0,$f16;");
-+ asm("punpckhbh $f6,$f6,$f4;");
-+ asm("ldc1 $f22,%0;"::"m"(*(block+0*8+4)));
-+ asm("paddsh $f6,$f6,$f22;");
-+ asm("punpcklbh $f2,$f2,$f4;");
-+ asm("ldc1 $f16,%0;"::"m"(*(block+1*8)));
-+ asm("paddsh $f2,$f2,$f16;");
-+ asm("packushb $f0,$f0,$f6;");
-+ asm("punpckhbh $f8,$f8,$f4;");
-+ asm("sdc1 $f0,%0;":"=m"(*dest));
-+ asm("ldc1 $f22,%0;"::"m"(*(block+1*8+4)));
-+ asm("paddsh $f8,$f8,$f22;");
-+ ADD_GODSON2C (2*8, $f0, $f6, $f2, $f8);
-+ ADD_GODSON2C (3*8, $f2, $f8, $f0, $f6);
-+ ADD_GODSON2C (4*8, $f0, $f6, $f2, $f8);
-+ ADD_GODSON2C (5*8, $f2, $f8, $f0, $f6);
-+ ADD_GODSON2C (6*8, $f0, $f6, $f2, $f8);
-+ ADD_GODSON2C (7*8, $f2, $f8, $f0, $f6);
-+ asm("packushb $f2,$f2,$f8;");
-+ asm("sdc1 $f2,%0;":"=m"(*(dest+stride)));
-+}*/
-+
-+/*static inline void block_zero(int16_t * const block)
-+{
-+ asm("fxor $f4,$f4,$f4;");
-+ asm("sdc1 $f4,%0;":"=m"(*(block+0*4)));
-+ asm("sdc1 $f4,%0;":"=m"(*(block+1*4)));
-+ asm("sdc1 $f4,%0;":"=m"(*(block+2*4)));
-+ asm("sdc1 $f4,%0;":"=m"(*(block+3*4)));
-+ asm("sdc1 $f4,%0;":"=m"(*(block+4*4)));
-+ asm("sdc1 $f4,%0;":"=m"(*(block+5*4)));
-+ asm("sdc1 $f4,%0;":"=m"(*(block+6*4)));
-+ asm("sdc1 $f4,%0;":"=m"(*(block+7*4)));
-+ asm("sdc1 $f4,%0;":"=m"(*(block+8*4)));
-+ asm("sdc1 $f4,%0;":"=m"(*(block+9*4)));
-+ asm("sdc1 $f4,%0;":"=m"(*(block+10*4)));
-+ asm("sdc1 $f4,%0;":"=m"(*(block+11*4)));
-+ asm("sdc1 $f4,%0;":"=m"(*(block+12*4)));
-+ asm("sdc1 $f4,%0;":"=m"(*(block+13*4)));
-+ asm("sdc1 $f4,%0;":"=m"(*(block+14*4)));
-+ asm("sdc1 $f4,%0;":"=m"(*(block+15*4)));
-+}*/
-+
-+/*#define dup4(reg) \
-+do { \
-+ asm(".set\tmips3"::); \
-+ asm("dmtc1 $0,$f16;");\
-+ asm(".set\tmips2"::); \
-+ asm("pshufh " #reg "," #reg ",$f16;"); \
-+} while (0)*/
-+
-+/*static inline void block_add_DC (int16_t * const block, uint8_t * dest,
-+ const int stride, const int cpu)
-+{
-+ int32_t temp;
-+ int i;
-+
-+ //asm("lwc1 $f4,%0;"::"m"((block[0]+64)>>7));
-+ asm("lwc1 $f4,%0;"::"m"((block[0]+4)>>3));
-+ asm("mtc1 $0, $f5;");
-+ asm("fxor $f0,$f0,$f0;");
-+ asm("ldc1 $f6,%0;"::"m"(*dest));
-+
-+
-+ dup4($f4);
-+ asm("psubsh $f0,$f0,$f4;");
-+ asm("packushb $f4,$f4,$f4;");
-+ asm("paddusb $f6,$f6,$f4;");
-+ asm("packushb $f0,$f0,$f0;");
-+ asm("ldc1 $f2,%0;"::"m"(*(dest+stride)));
-+ asm("psubusb $f6,$f6,$f0;");
-+ block[0]=0;
-+ asm("paddusb $f2,$f2,$f4;");
-+ asm("sdc1 $f6,%0;":"=m"(*dest));
-+
-+ asm("psubusb $f2,$f2,$f0;");
-+ asm("ldc1 $f6,%0;"::"m"(*(dest+2*stride)));
-+ dest+=stride;
-+ asm("sdc1 $f2,%0;":"=m"(*dest));
-+
-+ asm("paddusb $f6,$f6,$f4;");
-+ asm("ldc1 $f2,%0;"::"m"(*(dest+2*stride)));
-+ asm("psubusb $f6,$f6,$f0;");
-+ dest+=stride;
-+ asm("paddusb $f2,$f2,$f4;");
-+ asm("sdc1 $f6,%0;":"=m"(*dest));
-+
-+ asm("psubusb $f2,$f2,$f0;");
-+ asm("ldc1 $f6,%0;"::"m"(*(dest+2*stride)));
-+ dest+=stride;
-+ asm("sdc1 $f2,%0;":"=m"(*dest));
-+ asm("paddusb $f6,$f6,$f4;");
-+ asm("ldc1 $f2,%0;"::"m"(*(dest+2*stride)));
-+ asm("psubusb $f6,$f6,$f0;");
-+ dest+=stride;
-+ asm("paddusb $f2,$f2,$f4;");
-+ asm("sdc1 $f6,%0;":"=m"(*dest));
-+
-+ asm("psubusb $f2,$f2,$f0;");
-+ asm("ldc1 $f6,%0;"::"m"(*(dest+2*stride)));
-+ dest+=stride;
-+ asm("sdc1 $f2,%0;":"=m"(*dest));
-+
-+ asm("paddusb $f6,$f6,$f4;");
-+ asm("ldc1 $f2,%0;"::"m"(*(dest+2*stride)));
-+ asm("psubusb $f6,$f6,$f0;");
-+ block[63]=0;
-+ asm("paddusb $f2,$f2,$f4;");
-+ asm("sdc1 $f6,%0;":"=m"(*(dest+stride)));
-+
-+ asm("psubusb $f2,$f2,$f0;");
-+ asm("sdc1 $f2,%0;":"=m"(*(dest+2*stride)));
-+
-+}*/
-+
+void ff_godson2c_idct(DCTELEM *block);
+
+declare_idct (ff_godson2c_idct, godson2c_table,
+ godson2c_row_head, godson2c_row, godson2c_row_tail, godson2c_row_mid)
-+/*
-+void mpeg2_idct_copy_c (int16_t * const block, uint8_t * const dest,
-+ const int stride)
-+{
-+
-+ godson2c_idct (block);
-+
-+ block_copy (block, dest, stride);
-+ block_zero (block);
-+}
-+
-+void mpeg2_idct_add_c (const int last, int16_t * const block,
-+ uint8_t * const dest, const int stride)
-+{
-+#define CPU_GODSON2C 1
-+ if (last != 129 || (block[0] & 7) == 4) {
-+ godson2c_idct (block);
-+ block_add (block, dest, stride);
-+ block_zero (block);
-+ } else
-+ block_add_DC (block, dest, stride, CPU_GODSON2C);
-+}
-+
-+void mpeg2_idct_init (uint32_t accel)
-+{
-+#ifdef ARCH_X86
-+ if (accel & MPEG2_ACCEL_X86_MMXEXT) {
-+ mpeg2_idct_copy = mpeg2_idct_copy_mmxext;
-+ mpeg2_idct_add = mpeg2_idct_add_mmxext;
-+ mpeg2_idct_mmx_init ();
-+ } else if (accel & MPEG2_ACCEL_X86_MMX) {
-+ mpeg2_idct_copy = mpeg2_idct_copy_mmx;
-+ mpeg2_idct_add = mpeg2_idct_add_mmx;
-+ mpeg2_idct_mmx_init ();
-+ } else
-+#endif
-+#ifdef ARCH_PPC
-+ if (accel & MPEG2_ACCEL_PPC_ALTIVEC) {
-+ mpeg2_idct_copy = mpeg2_idct_copy_altivec;
-+ mpeg2_idct_add = mpeg2_idct_add_altivec;
-+ mpeg2_idct_altivec_init ();
-+ } else
-+#endif
-+#ifdef ARCH_ALPHA
-+ if (accel & MPEG2_ACCEL_ALPHA_MVI) {
-+ mpeg2_idct_copy = mpeg2_idct_copy_mvi;
-+ mpeg2_idct_add = mpeg2_idct_add_mvi;
-+ mpeg2_idct_alpha_init ();
-+ } else if (accel & MPEG2_ACCEL_ALPHA) {
-+ int i;
-+
-+ mpeg2_idct_copy = mpeg2_idct_copy_alpha;
-+ mpeg2_idct_add = mpeg2_idct_add_alpha;
-+ mpeg2_idct_alpha_init ();
-+ for (i = -3840; i < 3840 + 256; i++)
-+ CLIP(i) = (i < 0) ? 0 : ((i > 255) ? 255 : i);
-+ } else
-+#endif
-+ {
-+ extern uint8_t mpeg2_scan_norm[64];
-+ extern uint8_t mpeg2_scan_alt[64];
-+ int i, j;
-+
-+ mpeg2_idct_copy = mpeg2_idct_copy_c;
-+ mpeg2_idct_add = mpeg2_idct_add_c;
-+ for (i = 0; i < 64; i++) {
-+ j = mpeg2_scan_norm[i];
-+ mpeg2_scan_norm[i] = (j & 0x38) | ((j & 6) >> 1) | ((j & 1) << 2);
-+ j = mpeg2_scan_alt[i];
-+ mpeg2_scan_alt[i] = (j & 0x38) | ((j & 6) >> 1) | ((j & 1) << 2);
-+ }
-+ }
-+}*/
-diff -urN mplayer-20070622.orig/libavcodec/idct.h mplayer-20070622/libavcodec/idct.h
---- mplayer-20070622.orig/libavcodec/idct.h 1970-01-01 08:00:00.000000000 +0800
-+++ mplayer-20070622/libavcodec/idct.h 2007-08-04 07:23:17.000000000 +0800
+diff -urN -x .git mplayer.orig/libavcodec/idct.h mplayer-20070622/libavcodec/idct.h
+--- mplayer.orig/libavcodec/idct.h 1970-01-01 08:00:00.000000000 +0800
++++ mplayer-20070622/libavcodec/idct.h 2007-08-04 17:53:30.000000000 +0800
@@ -0,0 +1 @@
+void ff_godson2c_idct(DCTELEM *block);
-diff -urN mplayer-20070622.orig/libavcodec/libfaac.c mplayer-20070622/libavcodec/libfaac.c
---- mplayer-20070622.orig/libavcodec/libfaac.c 2007-06-06 08:14:18.000000000 +0800
-+++ mplayer-20070622/libavcodec/libfaac.c 2007-08-04 07:23:17.000000000 +0800
+diff -urN -x .git mplayer.orig/libavcodec/indeo3.c mplayer-20070622/libavcodec/indeo3.c
+--- mplayer.orig/libavcodec/indeo3.c 2007-05-10 17:00:44.000000000 +0800
++++ mplayer-20070622/libavcodec/indeo3.c 2007-08-04 17:53:30.000000000 +0800
+@@ -22,6 +22,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include "avcodec.h"
+diff -urN -x .git mplayer.orig/libavcodec/interplayvideo.c mplayer-20070622/libavcodec/interplayvideo.c
+--- mplayer.orig/libavcodec/interplayvideo.c 2007-06-02 09:41:07.000000000 +0800
++++ mplayer-20070622/libavcodec/interplayvideo.c 2007-08-04 17:53:31.000000000 +0800
+@@ -38,6 +38,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include "avcodec.h"
+diff -urN -x .git mplayer.orig/libavcodec/libfaac.c mplayer-20070622/libavcodec/libfaac.c
+--- mplayer.orig/libavcodec/libfaac.c 2007-08-04 14:58:30.000000000 +0800
++++ mplayer-20070622/libavcodec/libfaac.c 2007-08-04 17:53:31.000000000 +0800
@@ -25,7 +25,7 @@
*/
@@ -1082,9 +1503,20 @@ diff -urN mplayer-20070622.orig/libavcodec/libfaac.c mplayer-20070622/libavcodec
typedef struct FaacAudioContext {
faacEncHandle faac_handle;
-diff -urN mplayer-20070622.orig/libavcodec/Makefile mplayer-20070622/libavcodec/Makefile
---- mplayer-20070622.orig/libavcodec/Makefile 2007-06-16 04:35:44.000000000 +0800
-+++ mplayer-20070622/libavcodec/Makefile 2007-08-04 07:23:17.000000000 +0800
+diff -urN -x .git mplayer.orig/libavcodec/libx264.c mplayer-20070622/libavcodec/libx264.c
+--- mplayer.orig/libavcodec/libx264.c 2007-06-06 16:51:41.000000000 +0800
++++ mplayer-20070622/libavcodec/libx264.c 2007-08-04 17:53:31.000000000 +0800
+@@ -25,6 +25,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ typedef struct X264Context {
+ x264_param_t params;
+diff -urN -x .git mplayer.orig/libavcodec/Makefile mplayer-20070622/libavcodec/Makefile
+--- mplayer.orig/libavcodec/Makefile 2007-08-04 14:58:30.000000000 +0800
++++ mplayer-20070622/libavcodec/Makefile 2007-08-04 16:45:15.000000000 +0800
@@ -9,6 +9,7 @@
OBJS= bitstream.o \
utils.o \
@@ -1093,1110 +1525,2033 @@ diff -urN mplayer-20070622.orig/libavcodec/Makefile mplayer-20070622/libavcodec/
mpegvideo.o \
jrevdct.o \
jfdctfst.o \
-diff -urN mplayer-20070622.orig/libavutil/common.h mplayer-20070622/libavutil/common.h
---- mplayer-20070622.orig/libavutil/common.h 2007-06-13 19:09:07.000000000 +0800
-+++ mplayer-20070622/libavutil/common.h 2007-08-04 07:26:40.000000000 +0800
-@@ -344,4 +344,225 @@
- #define STOP_TIMER(id) {}
- #endif
+diff -urN -x .git mplayer.orig/libavcodec/motion-test.c mplayer-20070622/libavcodec/motion-test.c
+--- mplayer.orig/libavcodec/motion-test.c 2007-06-10 21:54:11.000000000 +0800
++++ mplayer-20070622/libavcodec/motion-test.c 2007-08-04 17:53:32.000000000 +0800
+@@ -26,6 +26,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/time.h>
+ #include <unistd.h>
+diff -urN -x .git mplayer.orig/libavcodec/msrle.c mplayer-20070622/libavcodec/msrle.c
+--- mplayer.orig/libavcodec/msrle.c 2007-05-10 17:00:44.000000000 +0800
++++ mplayer-20070622/libavcodec/msrle.c 2007-08-04 17:53:35.000000000 +0800
+@@ -34,6 +34,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include "avcodec.h"
+diff -urN -x .git mplayer.orig/libavcodec/msvideo1.c mplayer-20070622/libavcodec/msvideo1.c
+--- mplayer.orig/libavcodec/msvideo1.c 2007-05-10 17:00:44.000000000 +0800
++++ mplayer-20070622/libavcodec/msvideo1.c 2007-08-04 17:53:35.000000000 +0800
+@@ -34,6 +34,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include "avcodec.h"
+diff -urN -x .git mplayer.orig/libavcodec/qtrle.c mplayer-20070622/libavcodec/qtrle.c
+--- mplayer.orig/libavcodec/qtrle.c 2007-05-10 17:00:44.000000000 +0800
++++ mplayer-20070622/libavcodec/qtrle.c 2007-08-04 17:53:36.000000000 +0800
+@@ -35,6 +35,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include "avcodec.h"
+diff -urN -x .git mplayer.orig/libavcodec/rangecoder.c mplayer-20070622/libavcodec/rangecoder.c
+--- mplayer.orig/libavcodec/rangecoder.c 2007-06-02 09:41:07.000000000 +0800
++++ mplayer-20070622/libavcodec/rangecoder.c 2007-08-04 17:53:36.000000000 +0800
+@@ -33,6 +33,7 @@
+ */
+
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "avcodec.h"
+ #include "rangecoder.h"
+diff -urN -x .git mplayer.orig/libavcodec/roqvideodec.c mplayer-20070622/libavcodec/roqvideodec.c
+--- mplayer.orig/libavcodec/roqvideodec.c 2007-06-06 18:40:05.000000000 +0800
++++ mplayer-20070622/libavcodec/roqvideodec.c 2007-08-04 17:53:36.000000000 +0800
+@@ -29,6 +29,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include "avcodec.h"
+diff -urN -x .git mplayer.orig/libavcodec/rpza.c mplayer-20070622/libavcodec/rpza.c
+--- mplayer.orig/libavcodec/rpza.c 2007-05-10 17:00:44.000000000 +0800
++++ mplayer-20070622/libavcodec/rpza.c 2007-08-04 17:53:36.000000000 +0800
+@@ -38,6 +38,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include "avcodec.h"
+diff -urN -x .git mplayer.orig/libavcodec/smc.c mplayer-20070622/libavcodec/smc.c
+--- mplayer.orig/libavcodec/smc.c 2007-05-10 17:00:44.000000000 +0800
++++ mplayer-20070622/libavcodec/smc.c 2007-08-04 17:53:37.000000000 +0800
+@@ -32,6 +32,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include "avcodec.h"
+diff -urN -x .git mplayer.orig/libavcodec/svq1.c mplayer-20070622/libavcodec/svq1.c
+--- mplayer.orig/libavcodec/svq1.c 2007-06-12 17:29:25.000000000 +0800
++++ mplayer-20070622/libavcodec/svq1.c 2007-08-04 17:53:37.000000000 +0800
+@@ -38,6 +38,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+ #include <limits.h>
+
+diff -urN -x .git mplayer.orig/libavcodec/truemotion1.c mplayer-20070622/libavcodec/truemotion1.c
+--- mplayer.orig/libavcodec/truemotion1.c 2007-05-10 17:00:44.000000000 +0800
++++ mplayer-20070622/libavcodec/truemotion1.c 2007-08-04 17:53:38.000000000 +0800
+@@ -32,6 +32,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include "avcodec.h"
+diff -urN -x .git mplayer.orig/libavcodec/ulti.c mplayer-20070622/libavcodec/ulti.c
+--- mplayer.orig/libavcodec/ulti.c 2007-06-02 09:41:07.000000000 +0800
++++ mplayer-20070622/libavcodec/ulti.c 2007-08-04 17:53:38.000000000 +0800
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include "avcodec.h"
+diff -urN -x .git mplayer.orig/libavcodec/vmdav.c mplayer-20070622/libavcodec/vmdav.c
+--- mplayer.orig/libavcodec/vmdav.c 2007-05-30 00:43:25.000000000 +0800
++++ mplayer-20070622/libavcodec/vmdav.c 2007-08-04 17:53:39.000000000 +0800
+@@ -43,6 +43,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include "avcodec.h"
+diff -urN -x .git mplayer.orig/libavcodec/vp3.c mplayer-20070622/libavcodec/vp3.c
+--- mplayer.orig/libavcodec/vp3.c 2007-05-10 17:00:44.000000000 +0800
++++ mplayer-20070622/libavcodec/vp3.c 2007-08-04 17:53:40.000000000 +0800
+@@ -33,6 +33,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include "avcodec.h"
+diff -urN -x .git mplayer.orig/libavcodec/vp5.c mplayer-20070622/libavcodec/vp5.c
+--- mplayer.orig/libavcodec/vp5.c 2007-05-05 23:21:57.000000000 +0800
++++ mplayer-20070622/libavcodec/vp5.c 2007-08-04 17:53:41.000000000 +0800
+@@ -23,6 +23,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "avcodec.h"
+ #include "dsputil.h"
+diff -urN -x .git mplayer.orig/libavcodec/vqavideo.c mplayer-20070622/libavcodec/vqavideo.c
+--- mplayer.orig/libavcodec/vqavideo.c 2007-05-10 17:00:44.000000000 +0800
++++ mplayer-20070622/libavcodec/vqavideo.c 2007-08-04 17:53:41.000000000 +0800
+@@ -67,6 +67,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include "avcodec.h"
+diff -urN -x .git mplayer.orig/libavcodec/xan.c mplayer-20070622/libavcodec/xan.c
+--- mplayer.orig/libavcodec/xan.c 2007-06-02 09:41:07.000000000 +0800
++++ mplayer-20070622/libavcodec/xan.c 2007-08-04 17:53:41.000000000 +0800
+@@ -32,6 +32,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include "avcodec.h"
+diff -urN -x .git mplayer.orig/libavformat/apc.c mplayer-20070622/libavformat/apc.c
+--- mplayer.orig/libavformat/apc.c 2007-04-08 19:34:15.000000000 +0800
++++ mplayer-20070622/libavformat/apc.c 2007-08-04 17:53:42.000000000 +0800
+@@ -21,6 +21,7 @@
+
+ #include "avformat.h"
+ #include "string.h"
++#include "libvo/fastmemset.h"
+
+ static int apc_probe(AVProbeData *p)
+ {
+diff -urN -x .git mplayer.orig/libavformat/audio.c mplayer-20070622/libavformat/audio.c
+--- mplayer.orig/libavformat/audio.c 2007-04-28 00:10:05.000000000 +0800
++++ mplayer-20070622/libavformat/audio.c 2007-08-04 17:53:42.000000000 +0800
+@@ -23,6 +23,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #ifdef HAVE_SOUNDCARD_H
+ #include <soundcard.h>
+ #else
+diff -urN -x .git mplayer.orig/libavformat/os_support.c mplayer-20070622/libavformat/os_support.c
+--- mplayer.orig/libavformat/os_support.c 2007-05-22 00:08:03.000000000 +0800
++++ mplayer-20070622/libavformat/os_support.c 2007-08-04 17:53:45.000000000 +0800
+@@ -26,6 +26,7 @@
+ #include <sys/timeb.h>
+ #elif defined(CONFIG_OS2)
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/time.h>
+ #else
+ #include <unistd.h>
+diff -urN -x .git mplayer.orig/libavutil/common.h mplayer-20070622/libavutil/common.h
+--- mplayer.orig/libavutil/common.h 2007-08-04 14:58:30.000000000 +0800
++++ mplayer-20070622/libavutil/common.h 2007-08-04 17:53:47.000000000 +0800
+@@ -35,6 +35,7 @@
+ # include <stdlib.h>
+ # include <stdio.h>
+ # include <string.h>
++#include "libvo/fastmemset.h"
+ # include <ctype.h>
+ # include <limits.h>
+ # include <errno.h>
+diff -urN -x .git mplayer.orig/libavutil/internal.h mplayer-20070622/libavutil/internal.h
+--- mplayer.orig/libavutil/internal.h 2007-06-17 06:59:13.000000000 +0800
++++ mplayer-20070622/libavutil/internal.h 2007-08-04 17:53:47.000000000 +0800
+@@ -263,7 +263,21 @@
+ /* btw, rintf() is existing on fbsd too -- alex */
+ static av_always_inline long int lrintf(float x)
+ {
+-#ifdef __MINGW32__
+#ifdef MIPSEL
-+#define memset godson_memset
-+static void *memset(void *s, int c, int n)
-+{
-+ register int i;
-+ unsigned char c0 = (unsigned char)c;
-+ unsigned short c1;
-+ unsigned int c2;
-+ unsigned long long c3;
-+ if ( ((unsigned int)(s+n) & ~0x7) >= (((unsigned int)s & ~0x7) + 8)) {
-+ c1 = ((unsigned short)c0 << 8) | c0;
-+ c2 = ((unsigned int)c1 << 16) | c1;
-+ c3 = ((unsigned long long)c2 << 32) | c2;
-+ switch ((unsigned int)s & 0x7) {
-+ case 1:
-+ *(unsigned char *)(s) = c0;
-+ *(unsigned short *)(s+1) = c1;
-+ *(unsigned int *)(s+3) = c2;
-+ break;
-+ case 2:
-+ *(unsigned short *)(s) = c1;
-+ *(unsigned int *)(s+2) = c2;
-+ break;
-+ case 3:
-+ *(unsigned char *)(s) = c0;
-+ *(unsigned int *)(s+1) = c2;
-+ break;
-+ case 4:
-+ *(unsigned int *)(s) = c2;
-+ break;
-+ case 5:
-+ *(unsigned char *)(s) = c0;
-+ *(unsigned short *)(s+1) = c1;
-+ break;
-+ case 6:
-+ *(unsigned short *)(s) = c1;
-+ break;
-+ case 7:
-+ *(unsigned char *)(s) = c0;
-+ break;
-+ }
-+ switch ((unsigned int)(s+n) & 0x7) {
-+ case 1:
-+ *(unsigned char *)(s+n-1) = c0;
-+ break;
-+ case 2:
-+ *(unsigned short *)(s+n-2) = c1;
-+ break;
-+ case 3:
-+ *(unsigned char *)(s+n-1) = c0;
-+ *(unsigned short *)(s+n-3) = c1;
-+ break;
-+ case 4:
-+ *(unsigned int *)(s+n-4) = c2;
-+ break;
-+ case 5:
-+ *(unsigned char *)(s+n-1) = c0;
-+ *(unsigned int *)(s+n-5) = c2;
-+ break;
-+ case 6:
-+ *(unsigned short *)(s+n-2) = c1;
-+ *(unsigned int *)(s+n-6) = c2;
-+ break;
-+ case 7:
-+ *(unsigned char *)(s+n-1) = c0;
-+ *(unsigned short *)(s+n-3) = c1;
-+ *(unsigned int *)(s+n-7) = c2;
-+ break;
-+ }
-+
-+ void *tmp = (void *)((unsigned int)(s+7)&~0x7);
-+ asm (
-+ ".set mips3\n\t"
-+ "ldc1 $f16,%0\n\t"
-+ ".set mips1\n\t"
-+ :
-+ :"m"(c3)
-+ );
-+
-+
-+ for (n = (((unsigned int)(s+n)&~0x7) - (((unsigned int)(s+7)&~0x7))); n > 0;) {
-+ if (n >= 128) {
-+ asm (
-+ ".set mips3\n\t"
-+ "sdc1 $f16,0(%0)\n\t"
-+ "sdc1 $f16,0x8(%0)\n\t"
-+ "sdc1 $f16,0x10(%0)\n\t"
-+ "sdc1 $f16,0x18(%0)\n\t"
-+ "sdc1 $f16,0x20(%0)\n\t"
-+ "sdc1 $f16,0x28(%0)\n\t"
-+ "sdc1 $f16,0x30(%0)\n\t"
-+ "sdc1 $f16,0x38(%0)\n\t"
-+ "sdc1 $f16,0x40(%0)\n\t"
-+ "sdc1 $f16,0x48(%0)\n\t"
-+ "sdc1 $f16,0x50(%0)\n\t"
-+ "sdc1 $f16,0x58(%0)\n\t"
-+ "sdc1 $f16,0x60(%0)\n\t"
-+ "sdc1 $f16,0x68(%0)\n\t"
-+ "sdc1 $f16,0x70(%0)\n\t"
-+ "sdc1 $f16,0x78(%0)\n\t"
-+ ".set mips1\n\t"
-+ :
-+ :"r"(tmp)
-+ );
-+ tmp += 128;
-+ n -= 128;
-+ continue;
-+ }
-+ if (n >= 64) {
-+ asm (
-+ ".set mips3\n\t"
-+ "sdc1 $f16,0(%0)\n\t"
-+ "sdc1 $f16,0x8(%0)\n\t"
-+ "sdc1 $f16,0x10(%0)\n\t"
-+ "sdc1 $f16,0x18(%0)\n\t"
-+ "sdc1 $f16,0x20(%0)\n\t"
-+ "sdc1 $f16,0x28(%0)\n\t"
-+ "sdc1 $f16,0x30(%0)\n\t"
-+ "sdc1 $f16,0x38(%0)\n\t"
-+ ".set mips1\n\t"
-+ :
-+ :"r"(tmp)
-+ );
-+
-+ tmp += 64;
-+ n -= 64;
-+ continue;
-+ }
-+ if (n >= 32) {
-+ asm (
-+ ".set mips3\n\t"
-+ "sdc1 $f16,0(%0)\n\t"
-+ "sdc1 $f16,0x8(%0)\n\t"
-+ "sdc1 $f16,0x10(%0)\n\t"
-+ "sdc1 $f16,0x18(%0)\n\t"
-+ ".set mips1\n\t"
-+ :
-+ :"r"(tmp)
-+ );
-+ tmp += 32;
-+ n -= 32;
-+ continue;
-+ }
-+ if (n >= 16) {
-+ asm (
-+ ".set mips3\n\t"
-+ "sdc1 $f16,0(%0)\n\t"
-+ "sdc1 $f16,0x8(%0)\n\t"
-+ ".set mips1\n\t"
-+ :
-+ :"r"(tmp)
-+ );
-+ tmp += 16;
-+ n -= 16;
-+ continue;
-+ }
-+ asm (
-+ ".set mips3\n\t"
-+ "sdc1 $f16,0(%0)\n\t"
-+ ".set mips1\n\t"
-+ :
-+ :"r"(tmp)
-+ );
-+ n -= 8;
-+ }
-+ } else {
-+ for (;n>0;n--)
-+ *(unsigned char *)(s+n-1) = c0;
-+ }
-+ return s;
-+}
-+#endif
-+
-+#ifndef HAVE_LRINTF
-+/* XXX: add ISOC specific test to avoid specific BSD testing. */
-+/* better than nothing implementation. */
-+/* btw, rintf() is existing on fbsd too -- alex */
-+#ifdef MIPSEL
-+#define lrintf godson_lrintf
-+#endif
-+static always_inline long int lrintf(float x)
-+{
-+#ifdef MIPSEL
-+ int32_t i;
-+ asm volatile(
-+ ".set mips3\n\t"
-+ "lwc1 $f12,%1\n\t"
-+ "round.w.s $f2,$f12\n\t"
-+ "mfc1 $2,$f2\n\t"
-+ "sw $2,%0\n\t"
-+ ".set mips1\n\t"
-+ :"=m"(i)
-+ :"m"(x)
-+ :"$f12","$2"
-+ );
-+ return i;
-+
-+#endif
-+#ifdef CONFIG_WIN32
-+# ifdef ARCH_X86
-+ int32_t i;
-+ asm volatile(
-+ "fistpl %0\n\t"
-+ : "=m" (i) : "t" (x) : "st"
-+ );
-+ return i;
-+# else
-+ /* XXX: incorrect, but make it compile */
-+ return (int)(x + (x < 0 ? -0.5 : 0.5));
-+# endif /* ARCH_X86 */
-+#else
-+ return (int)(rint(x));
-+#endif /* CONFIG_WIN32 */
-+}
-+#else
-+#ifndef _ISOC9X_SOURCE
-+#define _ISOC9X_SOURCE
-+#endif
-+#include <math.h>
-+#endif /* HAVE_LRINTF */
-+
- #endif /* COMMON_H */
-diff -urN mplayer-20070622.orig/libavutil/common.h-loongson mplayer-20070622/libavutil/common.h-loongson
---- mplayer-20070622.orig/libavutil/common.h-loongson 1970-01-01 08:00:00.000000000 +0800
-+++ mplayer-20070622/libavutil/common.h-loongson 2007-08-04 07:23:17.000000000 +0800
-@@ -0,0 +1,840 @@
-+/**
-+ * @file common.h
-+ * common internal api header.
-+ */
-+
-+#ifndef COMMON_H
-+#define COMMON_H
-+
-+#if defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
-+# define CONFIG_WIN32
-+#endif
-+
-+#if defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(EMULATE_INTTYPES)
-+# define EMULATE_INTTYPES
-+#endif
-+
-+#ifndef M_PI
-+#define M_PI 3.14159265358979323846
-+#endif
-+
-+#ifdef HAVE_AV_CONFIG_H
-+/* only include the following when compiling package */
-+# include "config.h"
-+
-+# include <stdlib.h>
-+# include <stdio.h>
-+# include <string.h>
-+# include <ctype.h>
-+# include <limits.h>
-+# ifndef __BEOS__
-+# include <errno.h>
-+# else
-+# include "berrno.h"
-+# endif
-+# include <math.h>
-+
-+# ifndef ENODATA
-+# define ENODATA 61
-+# endif
-+
-+#include <stddef.h>
-+#ifndef offsetof
-+# define offsetof(T,F) ((unsigned int)((char *)&((T *)0)->F))
-+#endif
-+
-+#define AVOPTION_CODEC_BOOL(name, help, field) \
-+ { name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_BOOL }
-+#define AVOPTION_CODEC_DOUBLE(name, help, field, minv, maxv, defval) \
-+ { name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_DOUBLE, minv, maxv, defval }
-+#define AVOPTION_CODEC_FLAG(name, help, field, flag, defval) \
-+ { name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_FLAG, flag, 0, defval }
-+#define AVOPTION_CODEC_INT(name, help, field, minv, maxv, defval) \
-+ { name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_INT, minv, maxv, defval }
-+#define AVOPTION_CODEC_STRING(name, help, field, str, val) \
-+ { name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_STRING, .defval = val, .defstr = str }
-+#define AVOPTION_CODEC_RCOVERRIDE(name, help, field) \
-+ { name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_RCOVERRIDE, .defval = 0, .defstr = NULL }
-+#define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr }
-+#define AVOPTION_END() AVOPTION_SUB(NULL)
-+
-+#endif /* HAVE_AV_CONFIG_H */
-+
-+/* Suppress restrict if it was not defined in config.h. */
-+#ifndef restrict
-+# define restrict
-+#endif
-+
-+#ifndef always_inline
-+#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
-+# define always_inline __attribute__((always_inline)) inline
-+#else
-+# define always_inline inline
-+#endif
-+#endif
-+
-+#ifndef attribute_used
-+#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0) define attribute_used __attribute__((used))
-+#else
-+# define attribute_used
-+#endif
-+#endif
-+
-+#ifndef attribute_unused
-+#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
-+# define attribute_unused __attribute__((unused))
-+#else
-+# define attribute_unused
-+#endif
-+#endif
-+
-+#ifndef EMULATE_INTTYPES
-+# include <inttypes.h>
-+#else
-+ typedef signed char int8_t;
-+ typedef signed short int16_t;
-+ typedef signed int int32_t;
-+ typedef unsigned char uint8_t;
-+ typedef unsigned short uint16_t;
-+ typedef unsigned int uint32_t;
-+/*
-+
-+ # ifdef CONFIG_WIN32
-+ typedef signed __int64 int64_t;
-+ typedef unsigned __int64 uint64_t;
-+# else /* other OS */
-+ /* typedef signed long long int64_t;
-+ typedef unsigned long long uint64_t;
-+# endif /* other OS */
-+*/
-+
-+#endif /* EMULATE_INTTYPES */
-+
-+#ifndef PRId64
-+#define PRId64 "lld"
-+#endif
-+
-+#ifndef PRIu64
-+#define PRIu64 "llu"
-+#endif
-+
-+#ifndef PRIx64
-+#define PRIx64 "llx"
-+#endif
-+
-+#ifndef PRId32
-+#define PRId32 "d"
-+#endif
-+
-+#ifndef PRIdFAST16
-+#define PRIdFAST16 PRId32
-+#endif
-+
-+#ifndef PRIdFAST32
-+#define PRIdFAST32 PRId32
-+#endif
-+
-+#ifndef INT16_MIN
-+#define INT16_MIN (-0x7fff-1)
-+#endif
-+
-+#ifndef INT16_MAX
-+#define INT16_MAX 0x7fff
-+#endif
-+
-+#ifndef INT32_MIN
-+#define INT32_MIN (-0x7fffffff-1)
-+#endif
-+
-+#ifndef INT32_MAX
-+#define INT32_MAX 0x7fffffff
-+#endif
-+
-+#ifndef UINT32_MAX
-+#define UINT32_MAX 0xffffffff
-+#endif
-+
-+#ifndef INT64_MIN
-+#define INT64_MIN (-0x7fffffffffffffffLL-1)
-+#endif
-+
-+#ifndef INT64_MAX
-+#define INT64_MAX int64_t_C(9223372036854775807)
-+#endif
-+
-+#ifndef UINT64_MAX
-+#define UINT64_MAX uint64_t_C(0xFFFFFFFFFFFFFFFF)
-+#endif
-+
-+#ifdef EMULATE_FAST_INT
-+typedef signed char int_fast8_t;
-+typedef signed int int_fast16_t;
-+typedef signed int int_fast32_t;
-+typedef unsigned char uint_fast8_t;
-+typedef unsigned int uint_fast16_t;
-+typedef unsigned int uint_fast32_t;
-+typedef uint64_t uint_fast64_t;
-+#endif
-+
-+#ifndef INT_BIT
-+# if INT_MAX != 2147483647
-+# define INT_BIT 64
-+# else
-+# define INT_BIT 32
-+# endif
-+#endif
-+
-+#if defined(CONFIG_OS2) || defined(CONFIG_SUNOS)
-+static inline float floorf(float f) {
-+ return floor(f);
-+}
-+#endif
-+
-+#ifdef CONFIG_WIN32
-+
-+/* windows */
-+
-+# if !defined(__MINGW32__) && !defined(__CYGWIN__)
-+# define int64_t_C(c) (c ## i64)
-+# define uint64_t_C(c) (c ## i64)
-+
-+# ifdef HAVE_AV_CONFIG_H
-+# define inline __inline
-+# endif
-+
-+# else
-+# define int64_t_C(c) (c ## LL)
-+# define uint64_t_C(c) (c ## ULL)
-+# endif /* __MINGW32__ */
-+
-+# ifdef HAVE_AV_CONFIG_H
-+# ifdef _DEBUG
-+# define DEBUG
-+# endif
-+
-+# define snprintf _snprintf
-+# define vsnprintf _vsnprintf
-+
-+# ifdef CONFIG_WINCE
-+# define perror(a)
-+# endif
-+
-+# endif
-+
-+/* CONFIG_WIN32 end */
-+#elif defined (CONFIG_OS2)
-+/* OS/2 EMX */
-+
-+#ifndef int64_t_C
-+#define int64_t_C(c) (c ## LL)
-+#define uint64_t_C(c) (c ## ULL)
-+#endif
-+
-+#ifdef HAVE_AV_CONFIG_H
-+
-+//#ifdef USE_FASTMEMCPY
-+//#include "fastmemcpy.h"
-+//#endif
-+
-+#include <float.h>
-+
-+#endif /* HAVE_AV_CONFIG_H */
-+
-+/* CONFIG_OS2 end */
-+#else
-+
-+/* unix */
-+
-+#ifndef int64_t_C
-+#define int64_t_C(c) (c ## LL)
-+#define uint64_t_C(c) (c ## ULL)
-+#endif
-+
-+#ifdef HAVE_AV_CONFIG_H
-+
-+//# ifdef USE_FASTMEMCPY
-+//# include "fastmemcpy.h"
-+//# endif
-+# endif /* HAVE_AV_CONFIG_H */
-+
-+#endif /* !CONFIG_WIN32 && !CONFIG_OS2 */
-+
-+#ifdef HAVE_AV_CONFIG_H
-+
-+#if defined(__MINGW32__) && !defined(BUILD_AVUTIL) && defined(BUILD_SHARED_AV)
-+# define FF_IMPORT_ATTR __declspec(dllimport)
-+#else
-+# define FF_IMPORT_ATTR
-+#endif
-+
-+
-+# include "bswap.h"
-+
-+// Use rip-relative addressing if compiling PIC code on x86-64.
-+# if defined(__MINGW32__) || defined(__CYGWIN__) || \
-+ defined(__OS2__) || (defined (__OpenBSD__) && !defined(__ELF__))
-+# if defined(ARCH_X86_64) && defined(PIC)
-+# define MANGLE(a) "_" #a"(%%rip)"
-+# else
-+# define MANGLE(a) "_" #a
-+# endif
-+# else
-+# if defined(ARCH_X86_64) && defined(PIC)
-+# define MANGLE(a) #a"(%%rip)"
-+# elif defined(CONFIG_DARWIN)
-+# define MANGLE(a) "_" #a
-+# else
-+# define MANGLE(a) #a
-+# endif
-+# endif
-+
-+/* debug stuff */
-+
-+# ifndef DEBUG
-+# define NDEBUG
-+# endif
-+# include <assert.h>
-+
-+/* dprintf macros */
-+# if defined(CONFIG_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
-+
-+inline void dprintf(const char* fmt,...) {}
-+
-+# else
-+
-+# ifdef DEBUG
-+# define dprintf(fmt,...) av_log(NULL, AV_LOG_DEBUG, fmt, __VA_ARGS__)
-+# else
-+# define dprintf(fmt,...)
-+# endif
-+
-+# endif /* !CONFIG_WIN32 */
-+# ifdef CONFIG_WINCE
-+# define abort()
-+# endif
-+
-+# define av_abort() do { av_log(NULL, AV_LOG_ERROR, "Abort at %s:%d\n", __FILE__, __LINE__); abort(); } while (0)
-+
-+//rounded divison & shift
-+#define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
-+/* assume b>0 */
-+#define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b))
-+//#define ABS(a) ((a) >= 0 ? (a) : (-(a)))
-+#define FFABS(a) ((a) >= 0 ? (a) : (-(a)))
-+
-+#define FFMAX(a,b) ((a) > (b) ? (a) : (b))
-+#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
-+
-+extern const uint32_t inverse[256];
-+
-+#if defined(ARCH_X86) || defined(ARCH_X86_64)
-+# define FASTDIV(a,b) \
-+ ({\
-+ int ret,dmy;\
-+ asm volatile(\
-+ "mull %3"\
-+ :"=d"(ret),"=a"(dmy)\
-+ :"1"(a),"g"(inverse[b])\
-+ );\
-+ ret;\
-+ })
-+#elif defined(CONFIG_FASTDIV)
-+# define FASTDIV(a,b) ((uint32_t)((((uint64_t)a)*inverse[b])>>32))
-+#else
-+# define FASTDIV(a,b) ((a)/(b))
-+#endif
-+
-+/* define it to include statistics code (useful only for optimizing
-+ codec efficiency */
-+//#define STATS
-+
-+#ifdef STATS
-+
-+enum {
-+ ST_UNKNOWN,
-+ ST_DC,
-+ ST_INTRA_AC,
-+ ST_INTER_AC,
-+ ST_INTRA_MB,
-+ ST_INTER_MB,
-+ ST_MV,
-+ ST_NB,
-+};
-+
-+extern int st_current_index;
-+extern unsigned int st_bit_counts[ST_NB];
-+extern unsigned int st_out_bit_counts[ST_NB];
-+
-+void print_stats(void);
-+#endif
-+
-+/* misc math functions */
-+extern FF_IMPORT_ATTR const uint8_t ff_log2_tab[256];
-+
-+static inline int av_log2(unsigned int v)
-+{
-+ int n;
-+
-+ n = 0;
-+ if (v & 0xffff0000) {
-+ v >>= 16;
-+ n += 16;
-+ }
-+ if (v & 0xff00) {
-+ v >>= 8;
-+ n += 8;
-+ }
-+ n += ff_log2_tab[v];
-+
-+ return n;
-+}
-+
-+static inline int av_log2_16bit(unsigned int v)
-+{
-+ int n;
-+
-+ n = 0;
-+ if (v & 0xff00) {
-+ v >>= 8;
-+ n += 8;
-+ }
-+ n += ff_log2_tab[v];
-+
-+ return n;
-+}
-+
-+/* median of 3 */
-+static inline int mid_pred(int a, int b, int c)
-+{
-+#if 0
-+ int t= (a-b)&((a-b)>>31);
-+ a-=t;
-+ b+=t;
-+ b-= (b-c)&((b-c)>>31);
-+ b+= (a-b)&((a-b)>>31);
-+
-+ return b;
-+#else
-+ if(a>b){
-+ if(c>b){
-+ if(c>a) b=a;
-+ else b=c;
-+ }
-+ }else{
-+ if(b>c){
-+ if(c>a) b=c;
-+ else b=a;
-+ }
-+ }
-+ return b;
-+#endif
-+}
-+
-+/**
-+ * clip a signed integer value into the amin-amax range
-+ * @param a value to clip
-+ * @param amin minimum value of the clip range
-+ * @param amax maximum value of the clip range
-+ * @return cliped value
-+ */
-+static inline int clip(int a, int amin, int amax)
-+{
-+ if (a < amin)
-+ return amin;
-+ else if (a > amax)
-+ return amax;
-+ else
-+ return a;
-+}
-+
-+/**
-+ * clip a signed integer value into the 0-255 range
-+ * @param a value to clip
-+ * @return cliped value
-+ */
-+static inline uint8_t clip_uint8(int a)
-+{
-+ if (a&(~255)) return (-a)>>31;
-+ else return a;
-+}
-+
-+/* math */
-+extern FF_IMPORT_ATTR const uint8_t ff_sqrt_tab[128];
-+
-+int64_t ff_gcd(int64_t a, int64_t b);
-+
-+static inline int ff_sqrt(int a)
-+{
-+ int ret=0;
-+ int s;
-+ int ret_sq=0;
-+
-+ if(a<128) return ff_sqrt_tab[a];
-+
-+ for(s=15; s>=0; s--){
-+ int b= ret_sq + (1<<(s*2)) + (ret<<s)*2;
-+ if(b<=a){
-+ ret_sq=b;
-+ ret+= 1<<s;
-+ }
-+ }
-+ return ret;
-+}
-+
-+/**
-+ * converts fourcc string to int
-+ */
-+static inline int ff_get_fourcc(const char *s){
-+ assert( strlen(s)==4 );
-+
-+ return (s[0]) + (s[1]<<8) + (s[2]<<16) + (s[3]<<24);
-+}
-+
-+#define MKTAG(a,b,c,d) (a | (b << 8) | (c << 16) | (d << 24))
-+#define MKBETAG(a,b,c,d) (d | (c << 8) | (b << 16) | (a << 24))
-+
-+
-+#if defined(ARCH_X86) || defined(ARCH_X86_64)
-+#define MASK_ABS(mask, level)\
-+ asm volatile(\
-+ "cdq \n\t"\
-+ "xorl %1, %0 \n\t"\
-+ "subl %1, %0 \n\t"\
-+ : "+a" (level), "=&d" (mask)\
-+ );
-+#else
-+#define MASK_ABS(mask, level)\
-+ mask= level>>31;\
-+ level= (level^mask)-mask;
-+#endif
-+
-+
-+#if __CPU__ >= 686 && !defined(RUNTIME_CPUDETECT)
-+#define COPY3_IF_LT(x,y,a,b,c,d)\
-+asm volatile (\
-+ "cmpl %0, %3 \n\t"\
-+ "cmovl %3, %0 \n\t"\
-+ "cmovl %4, %1 \n\t"\
-+ "cmovl %5, %2 \n\t"\
-+ : "+r" (x), "+r" (a), "+r" (c)\
-+ : "r" (y), "r" (b), "r" (d)\
-+);
-+#else
-+#define COPY3_IF_LT(x,y,a,b,c,d)\
-+if((y)<(x)){\
-+ (x)=(y);\
-+ (a)=(b);\
-+ (c)=(d);\
-+}
-+#endif
-+
-+#if defined(ARCH_X86) || defined(ARCH_X86_64) || defined(ARCH_POWERPC)
-+#if defined(ARCH_X86_64)
-+static inline uint64_t read_time(void)
-+{
-+ uint64_t a, d;
-+ asm volatile( "rdtsc\n\t"
-+ : "=a" (a), "=d" (d)
-+ );
-+ return (d << 32) | (a & 0xffffffff);
-+}
-+#elif defined(ARCH_X86)
-+static inline long long read_time(void)
-+{
-+ long long l;
-+ asm volatile( "rdtsc\n\t"
-+ : "=A" (l)
-+ );
-+ return l;
-+}
-+#else //FIXME check ppc64
-+static inline uint64_t read_time(void)
-+{
-+ uint32_t tbu, tbl, temp;
-+
-+ /* from section 2.2.1 of the 32-bit PowerPC PEM */
-+ __asm__ __volatile__(
-+ "1:\n"
-+ "mftbu %2\n"
-+ "mftb %0\n"
-+ "mftbu %1\n"
-+ "cmpw %2,%1\n"
-+ "bne 1b\n"
-+ : "=r"(tbl), "=r"(tbu), "=r"(temp)
-+ :
-+ : "cc");
-+
-+ return (((uint64_t)tbu)<<32) | (uint64_t)tbl;
-+}
-+#endif
-+
-+#define START_TIMER \
-+uint64_t tend;\
-+uint64_t tstart= read_time();\
-+
-+#define STOP_TIMER(id) \
-+tend= read_time();\
-+{\
-+ static uint64_t tsum=0;\
-+ static int tcount=0;\
-+ static int tskip_count=0;\
-+ if(tcount<2 || tend - tstart < 8*tsum/tcount){\
-+ tsum+= tend - tstart;\
-+ tcount++;\
-+ }else\
-+ tskip_count++;\
-+ if(256*256*256*64%(tcount+tskip_count)==0){\
-+ av_log(NULL, AV_LOG_DEBUG, "%"PRIu64" dezicycles in %s, %d runs, %d skips\n", tsum*10/tcount, id, tcount, tskip_count);\
-+ }\
-+}
-+#else
-+#define START_TIMER
-+#define STOP_TIMER(id) {}
-+#endif
-+
-+/* avoid usage of various functions */
-+#define malloc please_use_av_malloc
-+#define free please_use_av_free
-+#define realloc please_use_av_realloc
-+#define time time_is_forbidden_due_to_security_issues
-+#define rand rand_is_forbidden_due_to_state_trashing
-+#define srand srand_is_forbidden_due_to_state_trashing
-+#define sprintf sprintf_is_forbidden_due_to_security_issues_use_snprintf
-+#define strcat strcat_is_forbidden_due_to_security_issues_use_pstrcat
-+#if !(defined(LIBAVFORMAT_BUILD) || defined(_FRAMEHOOK_H))
-+#define printf please_use_av_log
-+#define fprintf please_use_av_log
-+#endif
-+
-+#define CHECKED_ALLOCZ(p, size)\
-+{\
-+ p= av_mallocz(size);\
-+ if(p==NULL && (size)!=0){\
-+ perror("malloc");\
-+ goto fail;\
-+ }\
-+}
-+
-+#ifdef MIPSEL
-+#define memset godson_memset
-+static void *memset(void *s, int c, int n)
-+{
-+ register int i;
-+ unsigned char c0 = (unsigned char)c;
-+ unsigned short c1;
-+ unsigned int c2;
-+ unsigned long long c3;
-+ if ( ((unsigned int)(s+n) & ~0x7) >= (((unsigned int)s & ~0x7) + 8)) {
-+ c1 = ((unsigned short)c0 << 8) | c0;
-+ c2 = ((unsigned int)c1 << 16) | c1;
-+ c3 = ((unsigned long long)c2 << 32) | c2;
-+ switch ((unsigned int)s & 0x7) {
-+ case 1:
-+ *(unsigned char *)(s) = c0;
-+ *(unsigned short *)(s+1) = c1;
-+ *(unsigned int *)(s+3) = c2;
-+ break;
-+ case 2:
-+ *(unsigned short *)(s) = c1;
-+ *(unsigned int *)(s+2) = c2;
-+ break;
-+ case 3:
-+ *(unsigned char *)(s) = c0;
-+ *(unsigned int *)(s+1) = c2;
-+ break;
-+ case 4:
-+ *(unsigned int *)(s) = c2;
-+ break;
-+ case 5:
-+ *(unsigned char *)(s) = c0;
-+ *(unsigned short *)(s+1) = c1;
-+ break;
-+ case 6:
-+ *(unsigned short *)(s) = c1;
-+ break;
-+ case 7:
-+ *(unsigned char *)(s) = c0;
-+ break;
-+ }
-+ switch ((unsigned int)(s+n) & 0x7) {
-+ case 1:
-+ *(unsigned char *)(s+n-1) = c0;
-+ break;
-+ case 2:
-+ *(unsigned short *)(s+n-2) = c1;
-+ break;
-+ case 3:
-+ *(unsigned char *)(s+n-1) = c0;
-+ *(unsigned short *)(s+n-3) = c1;
-+ break;
-+ case 4:
-+ *(unsigned int *)(s+n-4) = c2;
-+ break;
-+ case 5:
-+ *(unsigned char *)(s+n-1) = c0;
-+ *(unsigned int *)(s+n-5) = c2;
-+ break;
-+ case 6:
-+ *(unsigned short *)(s+n-2) = c1;
-+ *(unsigned int *)(s+n-6) = c2;
-+ break;
-+ case 7:
-+ *(unsigned char *)(s+n-1) = c0;
-+ *(unsigned short *)(s+n-3) = c1;
-+ *(unsigned int *)(s+n-7) = c2;
-+ break;
-+ }
-+
-+ void *tmp = (void *)((unsigned int)(s+7)&~0x7);
-+ asm (
-+ ".set mips3\n\t"
-+ "ldc1 $f16,%0\n\t"
-+ ".set mips1\n\t"
-+ :
-+ :"m"(c3)
-+ );
-+
-+
-+ for (n = (((unsigned int)(s+n)&~0x7) - (((unsigned int)(s+7)&~0x7))); n > 0;) {
-+ if (n >= 128) {
-+ asm (
-+ ".set mips3\n\t"
-+ "sdc1 $f16,0(%0)\n\t"
-+ "sdc1 $f16,0x8(%0)\n\t"
-+ "sdc1 $f16,0x10(%0)\n\t"
-+ "sdc1 $f16,0x18(%0)\n\t"
-+ "sdc1 $f16,0x20(%0)\n\t"
-+ "sdc1 $f16,0x28(%0)\n\t"
-+ "sdc1 $f16,0x30(%0)\n\t"
-+ "sdc1 $f16,0x38(%0)\n\t"
-+ "sdc1 $f16,0x40(%0)\n\t"
-+ "sdc1 $f16,0x48(%0)\n\t"
-+ "sdc1 $f16,0x50(%0)\n\t"
-+ "sdc1 $f16,0x58(%0)\n\t"
-+ "sdc1 $f16,0x60(%0)\n\t"
-+ "sdc1 $f16,0x68(%0)\n\t"
-+ "sdc1 $f16,0x70(%0)\n\t"
-+ "sdc1 $f16,0x78(%0)\n\t"
-+ ".set mips1\n\t"
-+ :
-+ :"r"(tmp)
-+ );
-+ tmp += 128;
-+ n -= 128;
-+ continue;
-+ }
-+ if (n >= 64) {
-+ asm (
-+ ".set mips3\n\t"
-+ "sdc1 $f16,0(%0)\n\t"
-+ "sdc1 $f16,0x8(%0)\n\t"
-+ "sdc1 $f16,0x10(%0)\n\t"
-+ "sdc1 $f16,0x18(%0)\n\t"
-+ "sdc1 $f16,0x20(%0)\n\t"
-+ "sdc1 $f16,0x28(%0)\n\t"
-+ "sdc1 $f16,0x30(%0)\n\t"
-+ "sdc1 $f16,0x38(%0)\n\t"
-+ ".set mips1\n\t"
-+ :
-+ :"r"(tmp)
-+ );
-+
-+ tmp += 64;
-+ n -= 64;
-+ continue;
-+ }
-+ if (n >= 32) {
-+ asm (
-+ ".set mips3\n\t"
-+ "sdc1 $f16,0(%0)\n\t"
-+ "sdc1 $f16,0x8(%0)\n\t"
-+ "sdc1 $f16,0x10(%0)\n\t"
-+ "sdc1 $f16,0x18(%0)\n\t"
-+ ".set mips1\n\t"
-+ :
-+ :"r"(tmp)
-+ );
-+ tmp += 32;
-+ n -= 32;
-+ continue;
-+ }
-+ if (n >= 16) {
-+ asm (
-+ ".set mips3\n\t"
-+ "sdc1 $f16,0(%0)\n\t"
-+ "sdc1 $f16,0x8(%0)\n\t"
-+ ".set mips1\n\t"
-+ :
-+ :"r"(tmp)
-+ );
-+ tmp += 16;
-+ n -= 16;
-+ continue;
-+ }
-+ asm (
-+ ".set mips3\n\t"
-+ "sdc1 $f16,0(%0)\n\t"
-+ ".set mips1\n\t"
-+ :
-+ :"r"(tmp)
-+ );
-+ n -= 8;
-+ }
-+ } else {
-+ for (;n>0;n--)
-+ *(unsigned char *)(s+n-1) = c0;
-+ }
-+ return s;
-+}
-+#endif
-+#ifndef HAVE_LRINTF
-+/* XXX: add ISOC specific test to avoid specific BSD testing. */
-+/* better than nothing implementation. */
-+/* btw, rintf() is existing on fbsd too -- alex */
-+#ifdef MIPSEL
-+#define lrintf godson_lrintf
-+#endif
-+static always_inline long int lrintf(float x)
-+{
-+#ifdef MIPSEL
-+ int32_t i;
-+ asm volatile(
-+ ".set mips3\n\t"
-+ "lwc1 $f12,%1\n\t"
-+ "round.w.s $f2,$f12\n\t"
-+ "mfc1 $2,$f2\n\t"
-+ "sw $2,%0\n\t"
-+ ".set mips1\n\t"
-+ :"=m"(i)
-+ :"m"(x)
-+ :"$f12","$2"
-+ );
-+ return i;
-+
-+#endif
-+#ifdef CONFIG_WIN32
-+# ifdef ARCH_X86
+ int32_t i;
+ asm volatile(
-+ "fistpl %0\n\t"
-+ : "=m" (i) : "t" (x) : "st"
-+ );
++ ".set mips3\n\t"
++ "lwc1 $f12,%1\n\t"
++ "round.w.s $f2,$f12\n\t"
++ "mfc1 $2,$f2\n\t"
++ "sw $2,%0\n\t"
++ ".set mips1\n\t"
++ :"=m"(i)
++ :"m"(x)
++ :"$f12","$2"
++ );
+ return i;
-+# else
-+ /* XXX: incorrect, but make it compile */
-+ return (int)(x + (x < 0 ? -0.5 : 0.5));
-+# endif /* ARCH_X86 */
-+#else
-+ return (int)(rint(x));
-+#endif /* CONFIG_WIN32 */
-+}
-+#else
-+#ifndef _ISOC9X_SOURCE
-+#define _ISOC9X_SOURCE
-+#endif
-+#include <math.h>
-+#endif /* HAVE_LRINTF */
-+
-+#endif /* HAVE_AV_CONFIG_H */
-+
-+#endif /* COMMON_H */
-diff -urN mplayer-20070622.orig/libmpdemux/demux_audio.c mplayer-20070622/libmpdemux/demux_audio.c
---- mplayer-20070622.orig/libmpdemux/demux_audio.c 2007-03-16 02:36:36.000000000 +0800
-+++ mplayer-20070622/libmpdemux/demux_audio.c 2007-08-04 07:39:59.000000000 +0800
-@@ -11,7 +11,7 @@
- #include "genres.h"
++#elif __MINGW32__
+ # ifdef ARCH_X86_32
+ int32_t i;
+ asm volatile(
+diff -urN -x .git mplayer.orig/libavutil/lls.c mplayer-20070622/libavutil/lls.c
+--- mplayer.orig/libavutil/lls.c 2006-10-07 23:30:46.000000000 +0800
++++ mplayer-20070622/libavutil/lls.c 2007-08-04 17:53:47.000000000 +0800
+@@ -27,6 +27,7 @@
+
+ #include <math.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "lls.h"
+
+diff -urN -x .git mplayer.orig/libavutil/lzo.c mplayer-20070622/libavutil/lzo.c
+--- mplayer.orig/libavutil/lzo.c 2007-02-01 06:58:53.000000000 +0800
++++ mplayer-20070622/libavutil/lzo.c 2007-08-04 17:53:47.000000000 +0800
+@@ -22,6 +22,7 @@
+ //! avoid e.g. MPlayers fast_memcpy, it slows things down here
+ #undef memcpy
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include "lzo.h"
+
+ //! define if we may write up to 12 bytes beyond the output buffer
+diff -urN -x .git mplayer.orig/libavutil/md5.c mplayer-20070622/libavutil/md5.c
+--- mplayer.orig/libavutil/md5.c 2007-05-30 17:32:25.000000000 +0800
++++ mplayer-20070622/libavutil/md5.c 2007-08-04 17:53:47.000000000 +0800
+@@ -32,6 +32,7 @@
+
+ #include "common.h"
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include "md5.h"
+
+ typedef struct AVMD5{
+diff -urN -x .git mplayer.orig/libdvdcss/css.c mplayer-20070622/libdvdcss/css.c
+--- mplayer.orig/libdvdcss/css.c 2006-11-03 20:25:56.000000000 +0800
++++ mplayer-20070622/libdvdcss/css.c 2007-08-04 17:53:48.000000000 +0800
+@@ -39,6 +39,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #ifdef HAVE_SYS_PARAM_H
+diff -urN -x .git mplayer.orig/libdvdcss/device.c mplayer-20070622/libdvdcss/device.c
+--- mplayer.orig/libdvdcss/device.c 2006-11-08 00:42:39.000000000 +0800
++++ mplayer-20070622/libdvdcss/device.c 2007-08-04 17:53:48.000000000 +0800
+@@ -31,6 +31,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #ifdef HAVE_ERRNO_H
+ # include <errno.h>
+ #endif
+diff -urN -x .git mplayer.orig/libdvdcss/ioctl.c mplayer-20070622/libdvdcss/ioctl.c
+--- mplayer.orig/libdvdcss/ioctl.c 2006-11-03 20:25:56.000000000 +0800
++++ mplayer-20070622/libdvdcss/ioctl.c 2007-08-04 17:53:48.000000000 +0800
+@@ -36,6 +36,7 @@
+ #include <stdio.h>
+
+ #include <string.h> /* memcpy(), memset() */
++#include "libvo/fastmemset.h"
+ #include <sys/types.h>
+
+ #if defined( WIN32 )
+diff -urN -x .git mplayer.orig/libdvdcss/libdvdcss.c mplayer-20070622/libdvdcss/libdvdcss.c
+--- mplayer.orig/libdvdcss/libdvdcss.c 2006-11-03 20:25:56.000000000 +0800
++++ mplayer-20070622/libdvdcss/libdvdcss.c 2007-08-04 17:53:48.000000000 +0800
+@@ -101,6 +101,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #ifdef HAVE_SYS_PARAM_H
+diff -urN -x .git mplayer.orig/libfaad2/bits.c mplayer-20070622/libfaad2/bits.c
+--- mplayer.orig/libfaad2/bits.c 2006-04-19 03:39:34.000000000 +0800
++++ mplayer-20070622/libfaad2/bits.c 2007-08-04 17:53:48.000000000 +0800
+@@ -30,6 +30,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include "bits.h"
+
+ /* initialize buffer, call once before first getbits or showbits */
+diff -urN -x .git mplayer.orig/libfaad2/common.h mplayer-20070622/libfaad2/common.h
+--- mplayer.orig/libfaad2/common.h 2006-06-22 21:34:00.000000000 +0800
++++ mplayer-20070622/libfaad2/common.h 2007-08-04 17:53:49.000000000 +0800
+@@ -214,6 +214,7 @@
+ # include <memory.h>
+ # endif
+ # include <string.h>
++#include "libvo/fastmemset.h"
+ #endif
+ #if HAVE_STRINGS_H
+ # include <strings.h>
+@@ -245,6 +246,7 @@
+
+ #if STDC_HEADERS
+ # include <string.h>
++#include "libvo/fastmemset.h"
+ #else
+ # if !HAVE_STRCHR
+ # define strchr index
+diff -urN -x .git mplayer.orig/libfaad2/decoder.c mplayer-20070622/libfaad2/decoder.c
+--- mplayer.orig/libfaad2/decoder.c 2006-04-19 03:39:34.000000000 +0800
++++ mplayer-20070622/libfaad2/decoder.c 2007-08-04 17:53:49.000000000 +0800
+@@ -30,6 +30,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "decoder.h"
+ #include "mp4.h"
+diff -urN -x .git mplayer.orig/libfaad2/drc.c mplayer-20070622/libfaad2/drc.c
+--- mplayer.orig/libfaad2/drc.c 2006-04-19 03:39:34.000000000 +0800
++++ mplayer-20070622/libfaad2/drc.c 2007-08-04 17:53:49.000000000 +0800
+@@ -30,6 +30,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include "syntax.h"
+ #include "drc.h"
+
+diff -urN -x .git mplayer.orig/libfaad2/drm_dec.c mplayer-20070622/libfaad2/drm_dec.c
+--- mplayer.orig/libfaad2/drm_dec.c 2006-04-19 03:39:34.000000000 +0800
++++ mplayer-20070622/libfaad2/drm_dec.c 2007-08-04 17:53:49.000000000 +0800
+@@ -28,6 +28,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <math.h>
+ #include "common.h"
+
+diff -urN -x .git mplayer.orig/libfaad2/filtbank.c mplayer-20070622/libfaad2/filtbank.c
+--- mplayer.orig/libfaad2/filtbank.c 2006-04-19 03:39:34.000000000 +0800
++++ mplayer-20070622/libfaad2/filtbank.c 2007-08-04 17:53:49.000000000 +0800
+@@ -30,6 +30,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #ifdef _WIN32_WCE
+ #define assert(x)
+ #else
+diff -urN -x .git mplayer.orig/libfaad2/hcr.c mplayer-20070622/libfaad2/hcr.c
+--- mplayer.orig/libfaad2/hcr.c 2006-04-19 03:39:34.000000000 +0800
++++ mplayer-20070622/libfaad2/hcr.c 2007-08-04 17:53:49.000000000 +0800
+@@ -30,6 +30,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "specrec.h"
+ #include "huffman.h"
+diff -urN -x .git mplayer.orig/libfaad2/sbr_dec.c mplayer-20070622/libfaad2/sbr_dec.c
+--- mplayer.orig/libfaad2/sbr_dec.c 2006-06-22 21:34:00.000000000 +0800
++++ mplayer-20070622/libfaad2/sbr_dec.c 2007-08-04 17:53:52.000000000 +0800
+@@ -35,6 +35,7 @@
+ #ifdef SBR_DEC
+
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <stdlib.h>
+
+ #include "syntax.h"
+diff -urN -x .git mplayer.orig/libfaad2/sbr_qmf.c mplayer-20070622/libfaad2/sbr_qmf.c
+--- mplayer.orig/libfaad2/sbr_qmf.c 2006-04-19 03:39:34.000000000 +0800
++++ mplayer-20070622/libfaad2/sbr_qmf.c 2007-08-04 17:53:53.000000000 +0800
+@@ -33,6 +33,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include "sbr_dct.h"
+ #include "sbr_qmf.h"
+ #include "sbr_qmf_c.h"
+diff -urN -x .git mplayer.orig/libfaad2/specrec.c mplayer-20070622/libfaad2/specrec.c
+--- mplayer.orig/libfaad2/specrec.c 2006-06-22 21:34:00.000000000 +0800
++++ mplayer-20070622/libfaad2/specrec.c 2007-08-04 17:53:53.000000000 +0800
+@@ -36,6 +36,7 @@
+ #include "structs.h"
+
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <stdlib.h>
+ #include "specrec.h"
+ #include "filtbank.h"
+diff -urN -x .git mplayer.orig/libfaad2/ssr_fb.c mplayer-20070622/libfaad2/ssr_fb.c
+--- mplayer.orig/libfaad2/ssr_fb.c 2006-04-19 03:39:34.000000000 +0800
++++ mplayer-20070622/libfaad2/ssr_fb.c 2007-08-04 17:53:53.000000000 +0800
+@@ -31,6 +31,7 @@
+ #ifdef SSR_DEC
+
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <stdlib.h>
+ #include "syntax.h"
+ #include "filtbank.h"
+diff -urN -x .git mplayer.orig/libfaad2/syntax.c mplayer-20070622/libfaad2/syntax.c
+--- mplayer.orig/libfaad2/syntax.c 2006-04-19 03:39:34.000000000 +0800
++++ mplayer-20070622/libfaad2/syntax.c 2007-08-04 17:53:54.000000000 +0800
+@@ -34,6 +34,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "decoder.h"
+ #include "syntax.h"
+diff -urN -x .git mplayer.orig/libmenu/menu.c mplayer-20070622/libmenu/menu.c
+--- mplayer.orig/libmenu/menu.c 2007-05-20 23:17:56.000000000 +0800
++++ mplayer-20070622/libmenu/menu.c 2007-08-04 17:53:54.000000000 +0800
+@@ -6,6 +6,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <fcntl.h>
+ #include <unistd.h>
+
+diff -urN -x .git mplayer.orig/libmenu/menu_cmdlist.c mplayer-20070622/libmenu/menu_cmdlist.c
+--- mplayer.orig/libmenu/menu_cmdlist.c 2007-05-25 18:26:39.000000000 +0800
++++ mplayer-20070622/libmenu/menu_cmdlist.c 2007-08-04 17:53:54.000000000 +0800
+@@ -7,6 +7,7 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "libmpcodecs/img_format.h"
+ #include "libmpcodecs/mp_image.h"
+diff -urN -x .git mplayer.orig/libmenu/menu_console.c mplayer-20070622/libmenu/menu_console.c
+--- mplayer.orig/libmenu/menu_console.c 2006-08-18 21:58:03.000000000 +0800
++++ mplayer-20070622/libmenu/menu_console.c 2007-08-04 17:53:54.000000000 +0800
+@@ -6,6 +6,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <ctype.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+diff -urN -x .git mplayer.orig/libmenu/menu_dvbin.c mplayer-20070622/libmenu/menu_dvbin.c
+--- mplayer.orig/libmenu/menu_dvbin.c 2006-08-18 21:58:03.000000000 +0800
++++ mplayer-20070622/libmenu/menu_dvbin.c 2007-08-04 17:53:54.000000000 +0800
+@@ -4,6 +4,7 @@
+ #include <dirent.h>
+ #include <errno.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <ctype.h>
+diff -urN -x .git mplayer.orig/libmenu/menu_filesel.c mplayer-20070622/libmenu/menu_filesel.c
+--- mplayer.orig/libmenu/menu_filesel.c 2007-05-30 02:49:38.000000000 +0800
++++ mplayer-20070622/libmenu/menu_filesel.c 2007-08-04 17:53:54.000000000 +0800
+@@ -4,6 +4,7 @@
+ #include <dirent.h>
+ #include <errno.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+diff -urN -x .git mplayer.orig/libmenu/menu_list.c mplayer-20070622/libmenu/menu_list.c
+--- mplayer.orig/libmenu/menu_list.c 2006-08-18 21:58:03.000000000 +0800
++++ mplayer-20070622/libmenu/menu_list.c 2007-08-04 17:53:54.000000000 +0800
+@@ -3,6 +3,7 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+
+diff -urN -x .git mplayer.orig/libmenu/menu_param.c mplayer-20070622/libmenu/menu_param.c
+--- mplayer.orig/libmenu/menu_param.c 2007-05-30 15:07:32.000000000 +0800
++++ mplayer-20070622/libmenu/menu_param.c 2007-08-04 17:53:54.000000000 +0800
+@@ -6,6 +6,7 @@
+ #include <dirent.h>
+ #include <errno.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <ctype.h>
+diff -urN -x .git mplayer.orig/libmenu/menu_pt.c mplayer-20070622/libmenu/menu_pt.c
+--- mplayer.orig/libmenu/menu_pt.c 2007-02-22 02:28:48.000000000 +0800
++++ mplayer-20070622/libmenu/menu_pt.c 2007-08-04 17:53:54.000000000 +0800
+@@ -2,6 +2,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ //#include <libgen.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmenu/menu_txt.c mplayer-20070622/libmenu/menu_txt.c
+--- mplayer.orig/libmenu/menu_txt.c 2007-05-26 00:31:16.000000000 +0800
++++ mplayer-20070622/libmenu/menu_txt.c 2007-08-04 17:53:54.000000000 +0800
+@@ -6,6 +6,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "libmpcodecs/img_format.h"
+ #include "libmpcodecs/mp_image.h"
+diff -urN -x .git mplayer.orig/libmenu/vf_menu.c mplayer-20070622/libmenu/vf_menu.c
+--- mplayer.orig/libmenu/vf_menu.c 2007-06-05 23:09:49.000000000 +0800
++++ mplayer-20070622/libmenu/vf_menu.c 2007-08-04 17:53:54.000000000 +0800
+@@ -6,6 +6,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #ifdef HAVE_MALLOC_H
+ #include <malloc.h>
+diff -urN -x .git mplayer.orig/libmpcodecs/ad.c mplayer-20070622/libmpcodecs/ad.c
+--- mplayer.orig/libmpcodecs/ad.c 2007-03-16 01:51:32.000000000 +0800
++++ mplayer-20070622/libmpcodecs/ad.c 2007-08-04 17:53:54.000000000 +0800
+@@ -5,6 +5,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+
+diff -urN -x .git mplayer.orig/libmpcodecs/ad_hwac3.c mplayer-20070622/libmpcodecs/ad_hwac3.c
+--- mplayer.orig/libmpcodecs/ad_hwac3.c 2006-05-15 06:03:24.000000000 +0800
++++ mplayer-20070622/libmpcodecs/ad_hwac3.c 2007-08-04 17:53:54.000000000 +0800
+@@ -8,6 +8,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/ad_hwmpa.c mplayer-20070622/libmpcodecs/ad_hwmpa.c
+--- mplayer.orig/libmpcodecs/ad_hwmpa.c 2006-12-09 20:24:11.000000000 +0800
++++ mplayer-20070622/libmpcodecs/ad_hwmpa.c 2007-08-04 17:53:54.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/ad_libdv.c mplayer-20070622/libmpcodecs/ad_libdv.c
+--- mplayer.orig/libmpcodecs/ad_libdv.c 2007-04-02 05:59:54.000000000 +0800
++++ mplayer-20070622/libmpcodecs/ad_libdv.c 2007-08-04 17:53:54.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <math.h>
+diff -urN -x .git mplayer.orig/libmpcodecs/ae.c mplayer-20070622/libmpcodecs/ae.c
+--- mplayer.orig/libmpcodecs/ae.c 2007-03-16 01:51:32.000000000 +0800
++++ mplayer-20070622/libmpcodecs/ae.c 2007-08-04 17:53:55.000000000 +0800
+@@ -1,5 +1,6 @@
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <stdlib.h>
+ #include <inttypes.h>
+ #include <unistd.h>
+diff -urN -x .git mplayer.orig/libmpcodecs/ae_faac.c mplayer-20070622/libmpcodecs/ae_faac.c
+--- mplayer.orig/libmpcodecs/ae_faac.c 2007-03-16 01:51:32.000000000 +0800
++++ mplayer-20070622/libmpcodecs/ae_faac.c 2007-08-04 17:53:55.000000000 +0800
+@@ -3,6 +3,7 @@
+ #include <inttypes.h>
+ #include <unistd.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/types.h>
+ #include "m_option.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/ae_lame.c mplayer-20070622/libmpcodecs/ae_lame.c
+--- mplayer.orig/libmpcodecs/ae_lame.c 2007-03-16 01:51:32.000000000 +0800
++++ mplayer-20070622/libmpcodecs/ae_lame.c 2007-08-04 17:53:55.000000000 +0800
+@@ -3,6 +3,7 @@
+ #include <inttypes.h>
+ #include <unistd.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/types.h>
+ #include "m_option.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/ae_lavc.c mplayer-20070622/libmpcodecs/ae_lavc.c
+--- mplayer.orig/libmpcodecs/ae_lavc.c 2007-04-26 23:10:07.000000000 +0800
++++ mplayer-20070622/libmpcodecs/ae_lavc.c 2007-08-04 17:53:55.000000000 +0800
+@@ -3,6 +3,7 @@
+ #include <inttypes.h>
+ #include <unistd.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/types.h>
+ #include "m_option.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/ae_pcm.c mplayer-20070622/libmpcodecs/ae_pcm.c
+--- mplayer.orig/libmpcodecs/ae_pcm.c 2007-03-16 01:51:32.000000000 +0800
++++ mplayer-20070622/libmpcodecs/ae_pcm.c 2007-08-04 17:53:55.000000000 +0800
+@@ -3,6 +3,7 @@
+ #include <inttypes.h>
+ #include <unistd.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/types.h>
+ #include "m_option.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/ae_toolame.c mplayer-20070622/libmpcodecs/ae_toolame.c
+--- mplayer.orig/libmpcodecs/ae_toolame.c 2007-03-16 01:51:32.000000000 +0800
++++ mplayer-20070622/libmpcodecs/ae_toolame.c 2007-08-04 17:53:55.000000000 +0800
+@@ -3,6 +3,7 @@
+ #include <inttypes.h>
+ #include <unistd.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/types.h>
+ #include "m_option.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/ae_twolame.c mplayer-20070622/libmpcodecs/ae_twolame.c
+--- mplayer.orig/libmpcodecs/ae_twolame.c 2007-03-16 01:51:32.000000000 +0800
++++ mplayer-20070622/libmpcodecs/ae_twolame.c 2007-08-04 17:53:55.000000000 +0800
+@@ -3,6 +3,7 @@
+ #include <inttypes.h>
+ #include <unistd.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/types.h>
+ #include "m_option.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/pullup.c mplayer-20070622/libmpcodecs/pullup.c
+--- mplayer.orig/libmpcodecs/pullup.c 2006-11-17 16:36:10.000000000 +0800
++++ mplayer-20070622/libmpcodecs/pullup.c 2007-08-04 17:53:55.000000000 +0800
+@@ -3,6 +3,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include "pullup.h"
+ #include "config.h"
+ #include "cpudetect.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vd.c mplayer-20070622/libmpcodecs/vd.c
+--- mplayer.orig/libmpcodecs/vd.c 2007-04-23 15:42:42.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vd.c 2007-08-04 17:53:55.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #define USE_THEORA
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vd_ijpg.c mplayer-20070622/libmpcodecs/vd_ijpg.c
+--- mplayer.orig/libmpcodecs/vd_ijpg.c 2007-05-28 04:45:34.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vd_ijpg.c 2007-08-04 17:53:55.000000000 +0800
+@@ -2,6 +2,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vd_libdv.c mplayer-20070622/libmpcodecs/vd_libdv.c
+--- mplayer.orig/libmpcodecs/vd_libdv.c 2007-04-02 05:59:54.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vd_libdv.c 2007-08-04 17:53:55.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <math.h>
+diff -urN -x .git mplayer.orig/libmpcodecs/vd_mtga.c mplayer-20070622/libmpcodecs/vd_mtga.c
+--- mplayer.orig/libmpcodecs/vd_mtga.c 2007-06-05 23:09:51.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vd_mtga.c 2007-08-04 17:53:55.000000000 +0800
+@@ -7,6 +7,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vd_xanim.c mplayer-20070622/libmpcodecs/vd_xanim.c
+--- mplayer.orig/libmpcodecs/vd_xanim.c 2007-05-28 04:45:34.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vd_xanim.c 2007-08-04 17:53:55.000000000 +0800
+@@ -11,6 +11,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h> /* strerror */
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+
+diff -urN -x .git mplayer.orig/libmpcodecs/ve.c mplayer-20070622/libmpcodecs/ve.c
+--- mplayer.orig/libmpcodecs/ve.c 2007-02-19 03:28:47.000000000 +0800
++++ mplayer-20070622/libmpcodecs/ve.c 2007-08-04 17:53:55.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/ve_lavc.c mplayer-20070622/libmpcodecs/ve_lavc.c
+--- mplayer.orig/libmpcodecs/ve_lavc.c 2007-05-17 08:16:51.000000000 +0800
++++ mplayer-20070622/libmpcodecs/ve_lavc.c 2007-08-04 17:53:56.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <math.h>
+ #include <limits.h>
+ #include <time.h>
+diff -urN -x .git mplayer.orig/libmpcodecs/ve_libdv.c mplayer-20070622/libmpcodecs/ve_libdv.c
+--- mplayer.orig/libmpcodecs/ve_libdv.c 2007-03-16 01:51:32.000000000 +0800
++++ mplayer-20070622/libmpcodecs/ve_libdv.c 2007-08-04 17:53:56.000000000 +0800
+@@ -4,6 +4,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/ve_nuv.c mplayer-20070622/libmpcodecs/ve_nuv.c
+--- mplayer.orig/libmpcodecs/ve_nuv.c 2007-03-16 01:51:32.000000000 +0800
++++ mplayer-20070622/libmpcodecs/ve_nuv.c 2007-08-04 17:53:56.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/ve_qtvideo.c mplayer-20070622/libmpcodecs/ve_qtvideo.c
+--- mplayer.orig/libmpcodecs/ve_qtvideo.c 2007-03-16 01:51:32.000000000 +0800
++++ mplayer-20070622/libmpcodecs/ve_qtvideo.c 2007-08-04 17:53:56.000000000 +0800
+@@ -7,6 +7,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/ve_raw.c mplayer-20070622/libmpcodecs/ve_raw.c
+--- mplayer.orig/libmpcodecs/ve_raw.c 2007-04-12 04:28:44.000000000 +0800
++++ mplayer-20070622/libmpcodecs/ve_raw.c 2007-08-04 17:53:56.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/ve_vfw.c mplayer-20070622/libmpcodecs/ve_vfw.c
+--- mplayer.orig/libmpcodecs/ve_vfw.c 2007-03-25 06:01:20.000000000 +0800
++++ mplayer-20070622/libmpcodecs/ve_vfw.c 2007-08-04 17:53:56.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+ #include <inttypes.h>
+ #include <sys/stat.h>
+diff -urN -x .git mplayer.orig/libmpcodecs/ve_x264.c mplayer-20070622/libmpcodecs/ve_x264.c
+--- mplayer.orig/libmpcodecs/ve_x264.c 2007-03-16 01:51:32.000000000 +0800
++++ mplayer-20070622/libmpcodecs/ve_x264.c 2007-08-04 17:53:56.000000000 +0800
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <errno.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/ve_xvid4.c mplayer-20070622/libmpcodecs/ve_xvid4.c
+--- mplayer.orig/libmpcodecs/ve_xvid4.c 2007-03-16 01:51:32.000000000 +0800
++++ mplayer-20070622/libmpcodecs/ve_xvid4.c 2007-08-04 17:53:56.000000000 +0800
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <errno.h>
+ #include <math.h>
+ #include <limits.h>
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_1bpp.c mplayer-20070622/libmpcodecs/vf_1bpp.c
+--- mplayer.orig/libmpcodecs/vf_1bpp.c 2006-06-18 18:59:23.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_1bpp.c 2007-08-04 17:53:56.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_2xsai.c mplayer-20070622/libmpcodecs/vf_2xsai.c
+--- mplayer.orig/libmpcodecs/vf_2xsai.c 2006-03-22 05:26:42.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_2xsai.c 2007-08-04 17:53:56.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_ass.c mplayer-20070622/libmpcodecs/vf_ass.c
+--- mplayer.orig/libmpcodecs/vf_ass.c 2007-04-27 22:25:36.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_ass.c 2007-08-04 17:53:56.000000000 +0800
+@@ -23,6 +23,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <stdint.h>
+ #include <assert.h>
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_blackframe.c mplayer-20070622/libmpcodecs/vf_blackframe.c
+--- mplayer.orig/libmpcodecs/vf_blackframe.c 2006-07-15 18:35:22.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_blackframe.c 2007-08-04 17:53:56.000000000 +0800
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_bmovl.c mplayer-20070622/libmpcodecs/vf_bmovl.c
+--- mplayer.orig/libmpcodecs/vf_bmovl.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_bmovl.c 2007-08-04 17:53:56.000000000 +0800
+@@ -57,6 +57,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+ #include <errno.h>
+ #include <sys/stat.h>
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_boxblur.c mplayer-20070622/libmpcodecs/vf_boxblur.c
+--- mplayer.orig/libmpcodecs/vf_boxblur.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_boxblur.c 2007-08-04 17:53:56.000000000 +0800
+@@ -19,6 +19,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <assert.h>
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vf.c mplayer-20070622/libmpcodecs/vf.c
+--- mplayer.orig/libmpcodecs/vf.c 2007-04-26 23:10:07.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf.c 2007-08-04 17:53:56.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #ifdef HAVE_MALLOC_H
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_crop.c mplayer-20070622/libmpcodecs/vf_crop.c
+--- mplayer.orig/libmpcodecs/vf_crop.c 2007-01-29 00:48:01.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_crop.c 2007-08-04 17:53:56.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_cropdetect.c mplayer-20070622/libmpcodecs/vf_cropdetect.c
+--- mplayer.orig/libmpcodecs/vf_cropdetect.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_cropdetect.c 2007-08-04 17:53:56.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_decimate.c mplayer-20070622/libmpcodecs/vf_decimate.c
+--- mplayer.orig/libmpcodecs/vf_decimate.c 2006-08-13 08:21:14.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_decimate.c 2007-08-04 17:53:56.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_delogo.c mplayer-20070622/libmpcodecs/vf_delogo.c
+--- mplayer.orig/libmpcodecs/vf_delogo.c 2007-01-29 00:48:01.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_delogo.c 2007-08-04 17:53:56.000000000 +0800
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <math.h>
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_denoise3d.c mplayer-20070622/libmpcodecs/vf_denoise3d.c
+--- mplayer.orig/libmpcodecs/vf_denoise3d.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_denoise3d.c 2007-08-04 17:53:56.000000000 +0800
+@@ -19,6 +19,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <math.h>
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_detc.c mplayer-20070622/libmpcodecs/vf_detc.c
+--- mplayer.orig/libmpcodecs/vf_detc.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_detc.c 2007-08-04 17:53:56.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_dint.c mplayer-20070622/libmpcodecs/vf_dint.c
+--- mplayer.orig/libmpcodecs/vf_dint.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_dint.c 2007-08-04 17:53:56.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_divtc.c mplayer-20070622/libmpcodecs/vf_divtc.c
+--- mplayer.orig/libmpcodecs/vf_divtc.c 2006-12-07 19:58:07.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_divtc.c 2007-08-04 17:53:56.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <limits.h>
+ #include <math.h>
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_down3dright.c mplayer-20070622/libmpcodecs/vf_down3dright.c
+--- mplayer.orig/libmpcodecs/vf_down3dright.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_down3dright.c 2007-08-04 17:53:56.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_dsize.c mplayer-20070622/libmpcodecs/vf_dsize.c
+--- mplayer.orig/libmpcodecs/vf_dsize.c 2006-05-06 02:52:14.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_dsize.c 2007-08-04 17:53:56.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_dvbscale.c mplayer-20070622/libmpcodecs/vf_dvbscale.c
+--- mplayer.orig/libmpcodecs/vf_dvbscale.c 2005-11-18 22:39:25.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_dvbscale.c 2007-08-04 17:53:56.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_eq2.c mplayer-20070622/libmpcodecs/vf_eq2.c
+--- mplayer.orig/libmpcodecs/vf_eq2.c 2006-08-13 08:21:14.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_eq2.c 2007-08-04 17:53:56.000000000 +0800
+@@ -12,6 +12,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <math.h>
+ #include <inttypes.h>
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_eq.c mplayer-20070622/libmpcodecs/vf_eq.c
+--- mplayer.orig/libmpcodecs/vf_eq.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_eq.c 2007-08-04 17:53:56.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_expand.c mplayer-20070622/libmpcodecs/vf_expand.c
+--- mplayer.orig/libmpcodecs/vf_expand.c 2007-01-29 00:48:01.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_expand.c 2007-08-04 17:53:56.000000000 +0800
+@@ -3,6 +3,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_field.c mplayer-20070622/libmpcodecs/vf_field.c
+--- mplayer.orig/libmpcodecs/vf_field.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_field.c 2007-08-04 17:53:56.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_fil.c mplayer-20070622/libmpcodecs/vf_fil.c
+--- mplayer.orig/libmpcodecs/vf_fil.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_fil.c 2007-08-04 17:53:56.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_filmdint.c mplayer-20070622/libmpcodecs/vf_filmdint.c
+--- mplayer.orig/libmpcodecs/vf_filmdint.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_filmdint.c 2007-08-04 17:53:56.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <signal.h>
+ #include <sys/time.h>
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_flip.c mplayer-20070622/libmpcodecs/vf_flip.c
+--- mplayer.orig/libmpcodecs/vf_flip.c 2006-03-22 05:26:42.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_flip.c 2007-08-04 17:53:56.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_format.c mplayer-20070622/libmpcodecs/vf_format.c
+--- mplayer.orig/libmpcodecs/vf_format.c 2007-01-29 00:48:01.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_format.c 2007-08-04 17:53:56.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_framestep.c mplayer-20070622/libmpcodecs/vf_framestep.c
+--- mplayer.orig/libmpcodecs/vf_framestep.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_framestep.c 2007-08-04 17:53:56.000000000 +0800
+@@ -50,6 +50,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_fspp.c mplayer-20070622/libmpcodecs/vf_fspp.c
+--- mplayer.orig/libmpcodecs/vf_fspp.c 2007-06-05 23:09:49.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_fspp.c 2007-08-04 17:53:57.000000000 +0800
+@@ -33,6 +33,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <math.h>
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_geq.c mplayer-20070622/libmpcodecs/vf_geq.c
+--- mplayer.orig/libmpcodecs/vf_geq.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_geq.c 2007-08-04 17:53:57.000000000 +0800
+@@ -19,6 +19,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <math.h>
+ #include <inttypes.h>
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_halfpack.c mplayer-20070622/libmpcodecs/vf_halfpack.c
+--- mplayer.orig/libmpcodecs/vf_halfpack.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_halfpack.c 2007-08-04 17:53:57.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_harddup.c mplayer-20070622/libmpcodecs/vf_harddup.c
+--- mplayer.orig/libmpcodecs/vf_harddup.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_harddup.c 2007-08-04 17:53:57.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_hqdn3d.c mplayer-20070622/libmpcodecs/vf_hqdn3d.c
+--- mplayer.orig/libmpcodecs/vf_hqdn3d.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_hqdn3d.c 2007-08-04 17:53:57.000000000 +0800
+@@ -19,6 +19,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <math.h>
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_hue.c mplayer-20070622/libmpcodecs/vf_hue.c
+--- mplayer.orig/libmpcodecs/vf_hue.c 2007-01-29 00:48:01.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_hue.c 2007-08-04 17:53:57.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <math.h>
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_il.c mplayer-20070622/libmpcodecs/vf_il.c
+--- mplayer.orig/libmpcodecs/vf_il.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_il.c 2007-08-04 17:53:57.000000000 +0800
+@@ -19,6 +19,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <assert.h>
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_ilpack.c mplayer-20070622/libmpcodecs/vf_ilpack.c
+--- mplayer.orig/libmpcodecs/vf_ilpack.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_ilpack.c 2007-08-04 17:53:57.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_ivtc.c mplayer-20070622/libmpcodecs/vf_ivtc.c
+--- mplayer.orig/libmpcodecs/vf_ivtc.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_ivtc.c 2007-08-04 17:53:57.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_kerndeint.c mplayer-20070622/libmpcodecs/vf_kerndeint.c
+--- mplayer.orig/libmpcodecs/vf_kerndeint.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_kerndeint.c 2007-08-04 17:53:57.000000000 +0800
+@@ -19,6 +19,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <math.h>
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_lavc.c mplayer-20070622/libmpcodecs/vf_lavc.c
+--- mplayer.orig/libmpcodecs/vf_lavc.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_lavc.c 2007-08-04 17:53:57.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_lavcdeint.c mplayer-20070622/libmpcodecs/vf_lavcdeint.c
+--- mplayer.orig/libmpcodecs/vf_lavcdeint.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_lavcdeint.c 2007-08-04 17:53:57.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_mcdeint.c mplayer-20070622/libmpcodecs/vf_mcdeint.c
+--- mplayer.orig/libmpcodecs/vf_mcdeint.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_mcdeint.c 2007-08-04 17:53:57.000000000 +0800
+@@ -46,6 +46,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <math.h>
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_mirror.c mplayer-20070622/libmpcodecs/vf_mirror.c
+--- mplayer.orig/libmpcodecs/vf_mirror.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_mirror.c 2007-08-04 17:53:57.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_noformat.c mplayer-20070622/libmpcodecs/vf_noformat.c
+--- mplayer.orig/libmpcodecs/vf_noformat.c 2007-01-29 00:48:01.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_noformat.c 2007-08-04 17:53:57.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_noise.c mplayer-20070622/libmpcodecs/vf_noise.c
+--- mplayer.orig/libmpcodecs/vf_noise.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_noise.c 2007-08-04 17:53:57.000000000 +0800
+@@ -19,6 +19,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <math.h>
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_palette.c mplayer-20070622/libmpcodecs/vf_palette.c
+--- mplayer.orig/libmpcodecs/vf_palette.c 2006-06-30 20:00:31.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_palette.c 2007-08-04 17:53:57.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_perspective.c mplayer-20070622/libmpcodecs/vf_perspective.c
+--- mplayer.orig/libmpcodecs/vf_perspective.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_perspective.c 2007-08-04 17:53:57.000000000 +0800
+@@ -19,6 +19,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <assert.h>
+ #include <math.h>
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_phase.c mplayer-20070622/libmpcodecs/vf_phase.c
+--- mplayer.orig/libmpcodecs/vf_phase.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_phase.c 2007-08-04 17:53:57.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <limits.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_pp7.c mplayer-20070622/libmpcodecs/vf_pp7.c
+--- mplayer.orig/libmpcodecs/vf_pp7.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_pp7.c 2007-08-04 17:53:57.000000000 +0800
+@@ -20,6 +20,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <math.h>
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_pp.c mplayer-20070622/libmpcodecs/vf_pp.c
+--- mplayer.orig/libmpcodecs/vf_pp.c 2006-06-02 19:31:42.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_pp.c 2007-08-04 17:53:57.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <errno.h>
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_pullup.c mplayer-20070622/libmpcodecs/vf_pullup.c
+--- mplayer.orig/libmpcodecs/vf_pullup.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_pullup.c 2007-08-04 17:53:57.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_qp.c mplayer-20070622/libmpcodecs/vf_qp.c
+--- mplayer.orig/libmpcodecs/vf_qp.c 2006-04-18 04:20:28.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_qp.c 2007-08-04 17:53:57.000000000 +0800
+@@ -19,6 +19,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <math.h>
+ #include <inttypes.h>
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_rectangle.c mplayer-20070622/libmpcodecs/vf_rectangle.c
+--- mplayer.orig/libmpcodecs/vf_rectangle.c 2006-12-02 01:51:44.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_rectangle.c 2007-08-04 17:53:57.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include "mp_image.h"
+ #include "mp_msg.h"
+ #include "vf.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_remove_logo.c mplayer-20070622/libmpcodecs/vf_remove_logo.c
+--- mplayer.orig/libmpcodecs/vf_remove_logo.c 2007-02-21 18:05:46.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_remove_logo.c 2007-08-04 17:53:57.000000000 +0800
+@@ -87,6 +87,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <ctype.h>
+ #include <inttypes.h>
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_rgb2bgr.c mplayer-20070622/libmpcodecs/vf_rgb2bgr.c
+--- mplayer.orig/libmpcodecs/vf_rgb2bgr.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_rgb2bgr.c 2007-08-04 17:53:57.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_rgbtest.c mplayer-20070622/libmpcodecs/vf_rgbtest.c
+--- mplayer.orig/libmpcodecs/vf_rgbtest.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_rgbtest.c 2007-08-04 17:53:57.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_rotate.c mplayer-20070622/libmpcodecs/vf_rotate.c
+--- mplayer.orig/libmpcodecs/vf_rotate.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_rotate.c 2007-08-04 17:53:57.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_sab.c mplayer-20070622/libmpcodecs/vf_sab.c
+--- mplayer.orig/libmpcodecs/vf_sab.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_sab.c 2007-08-04 17:53:57.000000000 +0800
+@@ -19,6 +19,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <assert.h>
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_scale.c mplayer-20070622/libmpcodecs/vf_scale.c
+--- mplayer.orig/libmpcodecs/vf_scale.c 2007-06-08 04:01:05.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_scale.c 2007-08-04 17:53:57.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_screenshot.c mplayer-20070622/libmpcodecs/vf_screenshot.c
+--- mplayer.orig/libmpcodecs/vf_screenshot.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_screenshot.c 2007-08-04 17:53:57.000000000 +0800
+@@ -6,6 +6,7 @@
+ #include <malloc.h>
+ #endif
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include <sys/types.h>
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_smartblur.c mplayer-20070622/libmpcodecs/vf_smartblur.c
+--- mplayer.orig/libmpcodecs/vf_smartblur.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_smartblur.c 2007-08-04 17:53:57.000000000 +0800
+@@ -19,6 +19,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <assert.h>
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_softpulldown.c mplayer-20070622/libmpcodecs/vf_softpulldown.c
+--- mplayer.orig/libmpcodecs/vf_softpulldown.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_softpulldown.c 2007-08-04 17:53:57.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_softskip.c mplayer-20070622/libmpcodecs/vf_softskip.c
+--- mplayer.orig/libmpcodecs/vf_softskip.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_softskip.c 2007-08-04 17:53:57.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_spp.c mplayer-20070622/libmpcodecs/vf_spp.c
+--- mplayer.orig/libmpcodecs/vf_spp.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_spp.c 2007-08-04 17:53:58.000000000 +0800
+@@ -27,6 +27,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <math.h>
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_swapuv.c mplayer-20070622/libmpcodecs/vf_swapuv.c
+--- mplayer.orig/libmpcodecs/vf_swapuv.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_swapuv.c 2007-08-04 17:53:58.000000000 +0800
+@@ -19,6 +19,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <assert.h>
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_telecine.c mplayer-20070622/libmpcodecs/vf_telecine.c
+--- mplayer.orig/libmpcodecs/vf_telecine.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_telecine.c 2007-08-04 17:53:58.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_test.c mplayer-20070622/libmpcodecs/vf_test.c
+--- mplayer.orig/libmpcodecs/vf_test.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_test.c 2007-08-04 17:53:58.000000000 +0800
+@@ -19,6 +19,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_tfields.c mplayer-20070622/libmpcodecs/vf_tfields.c
+--- mplayer.orig/libmpcodecs/vf_tfields.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_tfields.c 2007-08-04 17:53:58.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_tile.c mplayer-20070622/libmpcodecs/vf_tile.c
+--- mplayer.orig/libmpcodecs/vf_tile.c 2006-03-31 08:15:47.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_tile.c 2007-08-04 17:53:58.000000000 +0800
+@@ -36,6 +36,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_tinterlace.c mplayer-20070622/libmpcodecs/vf_tinterlace.c
+--- mplayer.orig/libmpcodecs/vf_tinterlace.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_tinterlace.c 2007-08-04 17:53:58.000000000 +0800
+@@ -19,6 +19,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_unsharp.c mplayer-20070622/libmpcodecs/vf_unsharp.c
+--- mplayer.orig/libmpcodecs/vf_unsharp.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_unsharp.c 2007-08-04 17:53:58.000000000 +0800
+@@ -20,6 +20,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <math.h>
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_uspp.c mplayer-20070622/libmpcodecs/vf_uspp.c
+--- mplayer.orig/libmpcodecs/vf_uspp.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_uspp.c 2007-08-04 17:53:58.000000000 +0800
+@@ -19,6 +19,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <math.h>
+ #include <assert.h>
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_vo.c mplayer-20070622/libmpcodecs/vf_vo.c
+--- mplayer.orig/libmpcodecs/vf_vo.c 2007-04-27 22:25:36.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_vo.c 2007-08-04 17:53:58.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_yadif.c mplayer-20070622/libmpcodecs/vf_yadif.c
+--- mplayer.orig/libmpcodecs/vf_yadif.c 2007-06-05 23:09:49.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_yadif.c 2007-08-04 17:53:58.000000000 +0800
+@@ -19,6 +19,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <math.h>
+
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_yuvcsp.c mplayer-20070622/libmpcodecs/vf_yuvcsp.c
+--- mplayer.orig/libmpcodecs/vf_yuvcsp.c 2006-03-22 05:26:42.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_yuvcsp.c 2007-08-04 17:53:58.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_yuy2.c mplayer-20070622/libmpcodecs/vf_yuy2.c
+--- mplayer.orig/libmpcodecs/vf_yuy2.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_yuy2.c 2007-08-04 17:53:58.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_yvu9.c mplayer-20070622/libmpcodecs/vf_yvu9.c
+--- mplayer.orig/libmpcodecs/vf_yvu9.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_yvu9.c 2007-08-04 17:53:58.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpcodecs/vf_zrmjpeg.c mplayer-20070622/libmpcodecs/vf_zrmjpeg.c
+--- mplayer.orig/libmpcodecs/vf_zrmjpeg.c 2007-05-28 04:36:04.000000000 +0800
++++ mplayer-20070622/libmpcodecs/vf_zrmjpeg.c 2007-08-04 17:53:58.000000000 +0800
+@@ -18,6 +18,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpdemux/demux_aac.c mplayer-20070622/libmpdemux/demux_aac.c
+--- mplayer.orig/libmpdemux/demux_aac.c 2007-03-16 02:36:36.000000000 +0800
++++ mplayer-20070622/libmpdemux/demux_aac.c 2007-08-04 17:53:58.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpdemux/demux_audio.c mplayer-20070622/libmpdemux/demux_audio.c
+--- mplayer.orig/libmpdemux/demux_audio.c 2007-08-04 14:58:30.000000000 +0800
++++ mplayer-20070622/libmpdemux/demux_audio.c 2007-08-04 17:53:59.000000000 +0800
+@@ -12,6 +12,7 @@
#include "mp3_hdr.h"
--#include <string.h>
-+//#include <string.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
#ifdef MP_DEBUG
#include <assert.h>
#endif
-diff -urN mplayer-20070622.orig/libmpdemux/demux_real.c mplayer-20070622/libmpdemux/demux_real.c
---- mplayer-20070622.orig/libmpdemux/demux_real.c 2007-04-25 08:03:27.000000000 +0800
-+++ mplayer-20070622/libmpdemux/demux_real.c 2007-08-04 07:39:59.000000000 +0800
-@@ -1618,9 +1618,9 @@
- } else
- mp_msg(MSGT_DEMUX,MSGL_V,"Unknown logical stream\n");
- }
-- else {
-- mp_msg(MSGT_DEMUX, MSGL_ERR, "Not audio/video stream or unsupported!\n");
-- }
-+// else {
-+// mp_msg(MSGT_DEMUX, MSGL_ERR, "Not audio/video stream or unsupported!\n");
-+// }
- // break;
- // default:
- skip_this_chunk:
-diff -urN mplayer-20070622.orig/libmpeg2/idct.c mplayer-20070622/libmpeg2/idct.c
---- mplayer-20070622.orig/libmpeg2/idct.c 2006-12-10 02:09:41.000000000 +0800
-+++ mplayer-20070622/libmpeg2/idct.c 2007-08-04 08:18:48.000000000 +0800
+diff -urN -x .git mplayer.orig/libmpdemux/demuxer.c mplayer-20070622/libmpdemux/demuxer.c
+--- mplayer.orig/libmpdemux/demuxer.c 2007-06-17 21:28:52.000000000 +0800
++++ mplayer-20070622/libmpdemux/demuxer.c 2007-08-04 17:54:00.000000000 +0800
+@@ -3,6 +3,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include <sys/types.h>
+diff -urN -x .git mplayer.orig/libmpdemux/demux_lmlm4.c mplayer-20070622/libmpdemux/demux_lmlm4.c
+--- mplayer.orig/libmpdemux/demux_lmlm4.c 2007-03-16 02:36:36.000000000 +0800
++++ mplayer-20070622/libmpdemux/demux_lmlm4.c 2007-08-04 17:54:03.000000000 +0800
+@@ -8,6 +8,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h> /* strtok */
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpdemux/demux_mpc.c mplayer-20070622/libmpdemux/demux_mpc.c
+--- mplayer.orig/libmpdemux/demux_mpc.c 2007-03-16 02:36:36.000000000 +0800
++++ mplayer-20070622/libmpdemux/demux_mpc.c 2007-08-04 17:54:03.000000000 +0800
+@@ -10,6 +10,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include "mp_msg.h"
+ #include "libavutil/common.h"
+ #include "mpbswap.h"
+diff -urN -x .git mplayer.orig/libmpdemux/demux_ogg.c mplayer-20070622/libmpdemux/demux_ogg.c
+--- mplayer.orig/libmpdemux/demux_ogg.c 2007-05-28 16:42:35.000000000 +0800
++++ mplayer-20070622/libmpdemux/demux_ogg.c 2007-08-04 17:54:05.000000000 +0800
+@@ -4,6 +4,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <assert.h>
+ #include <math.h>
+ #include <inttypes.h>
+diff -urN -x .git mplayer.orig/libmpdemux/demux_pva.c mplayer-20070622/libmpdemux/demux_pva.c
+--- mplayer.orig/libmpdemux/demux_pva.c 2007-03-16 02:36:36.000000000 +0800
++++ mplayer-20070622/libmpdemux/demux_pva.c 2007-08-04 17:54:06.000000000 +0800
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpdemux/demux_rawaudio.c mplayer-20070622/libmpdemux/demux_rawaudio.c
+--- mplayer.orig/libmpdemux/demux_rawaudio.c 2007-03-16 02:36:36.000000000 +0800
++++ mplayer-20070622/libmpdemux/demux_rawaudio.c 2007-08-04 17:54:06.000000000 +0800
+@@ -5,6 +5,7 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "m_option.h"
+
+diff -urN -x .git mplayer.orig/libmpdemux/demux_rawvideo.c mplayer-20070622/libmpdemux/demux_rawvideo.c
+--- mplayer.orig/libmpdemux/demux_rawvideo.c 2007-03-16 02:36:36.000000000 +0800
++++ mplayer-20070622/libmpdemux/demux_rawvideo.c 2007-08-04 17:54:06.000000000 +0800
+@@ -5,6 +5,7 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "m_option.h"
+
+diff -urN -x .git mplayer.orig/libmpdemux/demux_smjpeg.c mplayer-20070622/libmpdemux/demux_smjpeg.c
+--- mplayer.orig/libmpdemux/demux_smjpeg.c 2007-03-16 02:36:36.000000000 +0800
++++ mplayer-20070622/libmpdemux/demux_smjpeg.c 2007-08-04 17:54:06.000000000 +0800
+@@ -12,6 +12,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h> /* strtok */
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpdemux/demux_ts.c mplayer-20070622/libmpdemux/demux_ts.c
+--- mplayer.orig/libmpdemux/demux_ts.c 2007-06-10 02:20:21.000000000 +0800
++++ mplayer-20070622/libmpdemux/demux_ts.c 2007-08-04 17:54:06.000000000 +0800
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpdemux/demux_ty_osd.c mplayer-20070622/libmpdemux/demux_ty_osd.c
+--- mplayer.orig/libmpdemux/demux_ty_osd.c 2007-03-16 02:36:36.000000000 +0800
++++ mplayer-20070622/libmpdemux/demux_ty_osd.c 2007-08-04 17:54:06.000000000 +0800
+@@ -12,6 +12,7 @@
+ #include <time.h>
+ #include <stdarg.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpdemux/demux_viv.c mplayer-20070622/libmpdemux/demux_viv.c
+--- mplayer.orig/libmpdemux/demux_viv.c 2007-03-16 02:36:36.000000000 +0800
++++ mplayer-20070622/libmpdemux/demux_viv.c 2007-08-04 17:54:06.000000000 +0800
+@@ -5,6 +5,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h> /* strtok */
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpdemux/demux_xmms.c mplayer-20070622/libmpdemux/demux_xmms.c
+--- mplayer.orig/libmpdemux/demux_xmms.c 2007-03-16 02:36:36.000000000 +0800
++++ mplayer-20070622/libmpdemux/demux_xmms.c 2007-08-04 17:54:06.000000000 +0800
+@@ -29,6 +29,7 @@
+ #include <dirent.h>
+ #include <inttypes.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/stat.h>
+
+ #include "m_option.h"
+diff -urN -x .git mplayer.orig/libmpdemux/demux_y4m.c mplayer-20070622/libmpdemux/demux_y4m.c
+--- mplayer.orig/libmpdemux/demux_y4m.c 2007-03-16 02:36:36.000000000 +0800
++++ mplayer-20070622/libmpdemux/demux_y4m.c 2007-08-04 17:54:06.000000000 +0800
+@@ -6,6 +6,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h> /* strtok */
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpdemux/extension.c mplayer-20070622/libmpdemux/extension.c
+--- mplayer.orig/libmpdemux/extension.c 2007-04-14 18:07:36.000000000 +0800
++++ mplayer-20070622/libmpdemux/extension.c 2007-08-04 17:54:06.000000000 +0800
+@@ -2,6 +2,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+
+diff -urN -x .git mplayer.orig/libmpdemux/mf.c mplayer-20070622/libmpdemux/mf.c
+--- mplayer.orig/libmpdemux/mf.c 2007-03-16 02:36:36.000000000 +0800
++++ mplayer-20070622/libmpdemux/mf.c 2007-08-04 17:54:07.000000000 +0800
+@@ -3,6 +3,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <errno.h>
+diff -urN -x .git mplayer.orig/libmpdemux/mpeg_hdr.c mplayer-20070622/libmpdemux/mpeg_hdr.c
+--- mplayer.orig/libmpdemux/mpeg_hdr.c 2007-01-20 21:46:17.000000000 +0800
++++ mplayer-20070622/libmpdemux/mpeg_hdr.c 2007-08-04 17:54:07.000000000 +0800
+@@ -5,6 +5,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mpeg_hdr.h"
+diff -urN -x .git mplayer.orig/libmpdemux/mpeg_packetizer.c mplayer-20070622/libmpdemux/mpeg_packetizer.c
+--- mplayer.orig/libmpdemux/mpeg_packetizer.c 2006-10-09 06:43:29.000000000 +0800
++++ mplayer-20070622/libmpdemux/mpeg_packetizer.c 2007-08-04 17:54:07.000000000 +0800
+@@ -24,6 +24,7 @@
+
+ #include <unistd.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpdemux/muxer_avi.c mplayer-20070622/libmpdemux/muxer_avi.c
+--- mplayer.orig/libmpdemux/muxer_avi.c 2007-03-16 02:36:36.000000000 +0800
++++ mplayer-20070622/libmpdemux/muxer_avi.c 2007-08-04 17:54:07.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <unistd.h>
+ #include <limits.h>
+diff -urN -x .git mplayer.orig/libmpdemux/muxer.c mplayer-20070622/libmpdemux/muxer.c
+--- mplayer.orig/libmpdemux/muxer.c 2007-04-26 23:10:07.000000000 +0800
++++ mplayer-20070622/libmpdemux/muxer.c 2007-08-04 17:54:07.000000000 +0800
+@@ -2,6 +2,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <unistd.h>
+
+diff -urN -x .git mplayer.orig/libmpdemux/muxer_lavf.c mplayer-20070622/libmpdemux/muxer_lavf.c
+--- mplayer.orig/libmpdemux/muxer_lavf.c 2007-05-18 10:10:41.000000000 +0800
++++ mplayer-20070622/libmpdemux/muxer_lavf.c 2007-08-04 17:54:07.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/types.h>
+ #include <inttypes.h>
+ #include <limits.h>
+diff -urN -x .git mplayer.orig/libmpdemux/muxer_mpeg.c mplayer-20070622/libmpdemux/muxer_mpeg.c
+--- mplayer.orig/libmpdemux/muxer_mpeg.c 2007-04-09 00:15:41.000000000 +0800
++++ mplayer-20070622/libmpdemux/muxer_mpeg.c 2007-08-04 17:54:07.000000000 +0800
+@@ -2,6 +2,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/types.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libmpdemux/muxer_rawaudio.c mplayer-20070622/libmpdemux/muxer_rawaudio.c
+--- mplayer.orig/libmpdemux/muxer_rawaudio.c 2007-03-16 02:36:36.000000000 +0800
++++ mplayer-20070622/libmpdemux/muxer_rawaudio.c 2007-08-04 17:54:07.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/types.h>
+
+ #include "help_mp.h"
+diff -urN -x .git mplayer.orig/libmpdemux/muxer_rawvideo.c mplayer-20070622/libmpdemux/muxer_rawvideo.c
+--- mplayer.orig/libmpdemux/muxer_rawvideo.c 2007-03-16 02:36:36.000000000 +0800
++++ mplayer-20070622/libmpdemux/muxer_rawvideo.c 2007-08-04 17:54:07.000000000 +0800
+@@ -2,6 +2,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <unistd.h>
+
+diff -urN -x .git mplayer.orig/libmpdemux/video.c mplayer-20070622/libmpdemux/video.c
+--- mplayer.orig/libmpdemux/video.c 2007-03-16 02:36:36.000000000 +0800
++++ mplayer-20070622/libmpdemux/video.c 2007-08-04 17:54:07.000000000 +0800
+@@ -8,6 +8,7 @@
+ #endif
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpdemux/yuv4mpeg.c mplayer-20070622/libmpdemux/yuv4mpeg.c
+--- mplayer.orig/libmpdemux/yuv4mpeg.c 2006-09-01 20:11:11.000000000 +0800
++++ mplayer-20070622/libmpdemux/yuv4mpeg.c 2007-08-04 17:54:07.000000000 +0800
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include "yuv4mpeg.h"
+ #include "yuv4mpeg_intern.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libmpdemux/yuv4mpeg_ratio.c mplayer-20070622/libmpdemux/yuv4mpeg_ratio.c
+--- mplayer.orig/libmpdemux/yuv4mpeg_ratio.c 2006-09-01 20:11:11.000000000 +0800
++++ mplayer-20070622/libmpdemux/yuv4mpeg_ratio.c 2007-08-04 17:54:07.000000000 +0800
+@@ -24,6 +24,7 @@
+ #include "config.h"
+
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include "yuv4mpeg.h"
+ #include "yuv4mpeg_intern.h"
+
+diff -urN -x .git mplayer.orig/libmpeg2/decode.c mplayer-20070622/libmpeg2/decode.c
+--- mplayer.orig/libmpeg2/decode.c 2006-12-09 18:34:27.000000000 +0800
++++ mplayer-20070622/libmpeg2/decode.c 2007-08-04 17:54:08.000000000 +0800
+@@ -28,6 +28,7 @@
+ #include "config.h"
+
+ #include <string.h> /* memcmp/memset, try to remove */
++#include "libvo/fastmemset.h"
+ #include <stdlib.h>
+ #include <inttypes.h>
+
+diff -urN -x .git mplayer.orig/libmpeg2/header.c mplayer-20070622/libmpeg2/header.c
+--- mplayer.orig/libmpeg2/header.c 2006-12-09 18:34:27.000000000 +0800
++++ mplayer-20070622/libmpeg2/header.c 2007-08-04 17:54:08.000000000 +0800
+@@ -31,6 +31,7 @@
+ #include <inttypes.h>
+ #include <stdlib.h> /* defines NULL */
+ #include <string.h> /* memcmp */
++#include "libvo/fastmemset.h"
+
+ #include "mpeg2.h"
+ #include "attributes.h"
+diff -urN -x .git mplayer.orig/libmpeg2/idct.c mplayer-20070622/libmpeg2/idct.c
+--- mplayer.orig/libmpeg2/idct.c 2007-08-04 14:58:31.000000000 +0800
++++ mplayer-20070622/libmpeg2/idct.c 2007-08-04 17:54:08.000000000 +0800
@@ -1,5 +1,5 @@
/*
- * idct.c
@@ -3024,9 +4379,9 @@ diff -urN mplayer-20070622.orig/libmpeg2/idct.c mplayer-20070622/libmpeg2/idct.c
}
}
}
-diff -urN mplayer-20070622.orig/libmpeg2/idct_loongson.c mplayer-20070622/libmpeg2/idct_loongson.c
---- mplayer-20070622.orig/libmpeg2/idct_loongson.c 1970-01-01 08:00:00.000000000 +0800
-+++ mplayer-20070622/libmpeg2/idct_loongson.c 2007-08-04 07:39:59.000000000 +0800
+diff -urN -x .git mplayer.orig/libmpeg2/idct_loongson.c mplayer-20070622/libmpeg2/idct_loongson.c
+--- mplayer.orig/libmpeg2/idct_loongson.c 1970-01-01 08:00:00.000000000 +0800
++++ mplayer-20070622/libmpeg2/idct_loongson.c 2007-08-04 17:54:08.000000000 +0800
@@ -0,0 +1,553 @@
+/*
+ * idct_mmx.c
@@ -3581,9 +4936,9 @@ diff -urN mplayer-20070622.orig/libmpeg2/idct_loongson.c mplayer-20070622/libmpe
+ mpeg2_scan_alt[i] = (j & 0x38) | ((j & 6) >> 1) | ((j & 1) << 2);
+ }
+}
-diff -urN mplayer-20070622.orig/libmpeg2/loongson_mmx.h mplayer-20070622/libmpeg2/loongson_mmx.h
---- mplayer-20070622.orig/libmpeg2/loongson_mmx.h 1970-01-01 08:00:00.000000000 +0800
-+++ mplayer-20070622/libmpeg2/loongson_mmx.h 2007-08-04 07:39:59.000000000 +0800
+diff -urN -x .git mplayer.orig/libmpeg2/loongson_mmx.h mplayer-20070622/libmpeg2/loongson_mmx.h
+--- mplayer.orig/libmpeg2/loongson_mmx.h 1970-01-01 08:00:00.000000000 +0800
++++ mplayer-20070622/libmpeg2/loongson_mmx.h 2007-08-04 17:54:08.000000000 +0800
@@ -0,0 +1,327 @@
+/*
+ * mmx.h
@@ -3912,9 +5267,9 @@ diff -urN mplayer-20070622.orig/libmpeg2/loongson_mmx.h mplayer-20070622/libmpeg
+#define pmullw_r2m(reg,var) mmx_r2m (pmullh, reg, var)
+
+#endif /* AVCODEC_LOOGSONMMX_H */
-diff -urN mplayer-20070622.orig/libmpeg2/Makefile mplayer-20070622/libmpeg2/Makefile
---- mplayer-20070622.orig/libmpeg2/Makefile 2007-06-16 23:24:39.000000000 +0800
-+++ mplayer-20070622/libmpeg2/Makefile 2007-08-04 07:53:57.000000000 +0800
+diff -urN -x .git mplayer.orig/libmpeg2/Makefile mplayer-20070622/libmpeg2/Makefile
+--- mplayer.orig/libmpeg2/Makefile 2007-08-04 14:58:31.000000000 +0800
++++ mplayer-20070622/libmpeg2/Makefile 2007-08-04 16:45:15.000000000 +0800
@@ -8,7 +8,9 @@
decode.c \
header.c \
@@ -3925,9 +5280,9 @@ diff -urN mplayer-20070622.orig/libmpeg2/Makefile mplayer-20070622/libmpeg2/Make
slice.c \
SRCS_COMMON-$(TARGET_MMX) += idct_mmx.c motion_comp_mmx.c
-diff -urN mplayer-20070622.orig/libmpeg2/motion_comp.c mplayer-20070622/libmpeg2/motion_comp.c
---- mplayer-20070622.orig/libmpeg2/motion_comp.c 2007-05-08 06:22:27.000000000 +0800
-+++ mplayer-20070622/libmpeg2/motion_comp.c 2007-08-04 07:39:59.000000000 +0800
+diff -urN -x .git mplayer.orig/libmpeg2/motion_comp.c mplayer-20070622/libmpeg2/motion_comp.c
+--- mplayer.orig/libmpeg2/motion_comp.c 2007-08-04 14:58:31.000000000 +0800
++++ mplayer-20070622/libmpeg2/motion_comp.c 2007-08-04 17:54:08.000000000 +0800
@@ -37,18 +37,12 @@
void mpeg2_mc_init (uint32_t accel)
@@ -4765,9 +6120,9 @@ diff -urN mplayer-20070622.orig/libmpeg2/motion_comp.c mplayer-20070622/libmpeg2
-
+*/
MPEG2_MC_EXTERN (c)
-diff -urN mplayer-20070622.orig/libmpeg2/motion_comp_loongson.c mplayer-20070622/libmpeg2/motion_comp_loongson.c
---- mplayer-20070622.orig/libmpeg2/motion_comp_loongson.c 1970-01-01 08:00:00.000000000 +0800
-+++ mplayer-20070622/libmpeg2/motion_comp_loongson.c 2007-08-04 07:39:59.000000000 +0800
+diff -urN -x .git mplayer.orig/libmpeg2/motion_comp_loongson.c mplayer-20070622/libmpeg2/motion_comp_loongson.c
+--- mplayer.orig/libmpeg2/motion_comp_loongson.c 1970-01-01 08:00:00.000000000 +0800
++++ mplayer-20070622/libmpeg2/motion_comp_loongson.c 2007-08-04 17:54:08.000000000 +0800
@@ -0,0 +1,497 @@
+/*
+ * motion_comp_mmx.c
@@ -5266,23 +6621,167 @@ diff -urN mplayer-20070622.orig/libmpeg2/motion_comp_loongson.c mplayer-20070622
+
+
+MPEG2_MC_EXTERN (mmx)
-diff -urN mplayer-20070622.orig/libvo/fastmemcpy.h mplayer-20070622/libvo/fastmemcpy.h
---- mplayer-20070622.orig/libvo/fastmemcpy.h 2007-06-05 22:27:54.000000000 +0800
-+++ mplayer-20070622/libvo/fastmemcpy.h 2007-08-04 07:52:48.000000000 +0800
+diff -urN -x .git mplayer.orig/libpostproc/postprocess.c mplayer-20070622/libpostproc/postprocess.c
+--- mplayer.orig/libpostproc/postprocess.c 2007-06-12 17:29:25.000000000 +0800
++++ mplayer-20070622/libpostproc/postprocess.c 2007-08-04 17:54:09.000000000 +0800
+@@ -79,6 +79,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #ifdef HAVE_MALLOC_H
+ #include <malloc.h>
+ #endif
+diff -urN -x .git mplayer.orig/libswscale/cs_test.c mplayer-20070622/libswscale/cs_test.c
+--- mplayer.orig/libswscale/cs_test.c 2007-04-28 19:44:49.000000000 +0800
++++ mplayer-20070622/libswscale/cs_test.c 2007-08-04 17:54:10.000000000 +0800
+@@ -20,6 +20,7 @@
+
+ #include <stdio.h>
+ #include <string.h> /* for memset() */
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <inttypes.h>
+diff -urN -x .git mplayer.orig/libswscale/swscale_bfin.c mplayer-20070622/libswscale/swscale_bfin.c
+--- mplayer.orig/libswscale/swscale_bfin.c 2007-06-22 20:45:18.000000000 +0800
++++ mplayer-20070622/libswscale/swscale_bfin.c 2007-08-04 17:54:10.000000000 +0800
+@@ -23,6 +23,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <assert.h>
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libswscale/swscale.c mplayer-20070622/libswscale/swscale.c
+--- mplayer.orig/libswscale/swscale.c 2007-06-22 21:03:40.000000000 +0800
++++ mplayer-20070622/libswscale/swscale.c 2007-08-04 17:54:10.000000000 +0800
+@@ -56,6 +56,7 @@
+
+ #include <inttypes.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <math.h>
+ #include <stdio.h>
+ #include <unistd.h>
+diff -urN -x .git mplayer.orig/libswscale/swscale-example.c mplayer-20070622/libswscale/swscale-example.c
+--- mplayer.orig/libswscale/swscale-example.c 2007-04-29 21:39:27.000000000 +0800
++++ mplayer-20070622/libswscale/swscale-example.c 2007-08-04 17:54:10.000000000 +0800
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <stdarg.h>
+
+diff -urN -x .git mplayer.orig/libswscale/yuv2rgb_altivec.c mplayer-20070622/libswscale/yuv2rgb_altivec.c
+--- mplayer.orig/libswscale/yuv2rgb_altivec.c 2007-04-30 05:36:43.000000000 +0800
++++ mplayer-20070622/libswscale/yuv2rgb_altivec.c 2007-08-04 17:54:11.000000000 +0800
+@@ -83,6 +83,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <assert.h>
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libswscale/yuv2rgb_bfin.c mplayer-20070622/libswscale/yuv2rgb_bfin.c
+--- mplayer.orig/libswscale/yuv2rgb_bfin.c 2007-05-14 03:22:32.000000000 +0800
++++ mplayer-20070622/libswscale/yuv2rgb_bfin.c 2007-08-04 17:54:11.000000000 +0800
+@@ -25,6 +25,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <assert.h>
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libvo/aclib.c mplayer-20070622/libvo/aclib.c
+--- mplayer.orig/libvo/aclib.c 2007-06-11 05:58:30.000000000 +0800
++++ mplayer-20070622/libvo/aclib.c 2007-08-04 17:46:43.000000000 +0800
+@@ -9,6 +9,7 @@
+ */
+ #include <stddef.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include "cpudetect.h"
+ #include "fastmemcpy.h"
+ #undef memcpy
+diff -urN -x .git mplayer.orig/libvo/fastmemcpy.h mplayer-20070622/libvo/fastmemcpy.h
+--- mplayer.orig/libvo/fastmemcpy.h 2007-08-04 14:58:31.000000000 +0800
++++ mplayer-20070622/libvo/fastmemcpy.h 2007-08-04 17:46:43.000000000 +0800
@@ -33,6 +33,10 @@
#else /* HAVE_MMX/MMX2/3DNOW/SSE/SSE2 */
#define mem2agpcpy(a,b,c) memcpy(a,b,c)
#define fast_memcpy(a,b,c) memcpy(a,b,c)
+
-+#ifndef memcpy
++#ifdef MIPSEL
+#define memcpy(a,b,c) godson_memcpy(a,b,c)
+#endif
#endif
#else /* USE_FASTMEMCPY */
-diff -urN mplayer-20070622.orig/libvo/godson_memcpy.S mplayer-20070622/libvo/godson_memcpy.S
---- mplayer-20070622.orig/libvo/godson_memcpy.S 1970-01-01 08:00:00.000000000 +0800
-+++ mplayer-20070622/libvo/godson_memcpy.S 2007-08-04 07:39:59.000000000 +0800
+diff -urN -x .git mplayer.orig/libvo/fastmemset.h mplayer-20070622/libvo/fastmemset.h
+--- mplayer.orig/libvo/fastmemset.h 1970-01-01 08:00:00.000000000 +0800
++++ mplayer-20070622/libvo/fastmemset.h 2007-08-04 17:46:43.000000000 +0800
+@@ -0,0 +1,8 @@
++#ifndef __MPLAYER_MEMSET
++#define __MPLAYER_MEMSET 1
++
++#ifdef MIPSEL
++#define memset(a,b,c) godson_memset(a,b,c)
++#endif
++
++#endif
+diff -urN -x .git mplayer.orig/libvo/font_load.c mplayer-20070622/libvo/font_load.c
+--- mplayer.orig/libvo/font_load.c 2006-08-27 23:33:11.000000000 +0800
++++ mplayer-20070622/libvo/font_load.c 2007-08-04 17:46:43.000000000 +0800
+@@ -3,6 +3,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+diff -urN -x .git mplayer.orig/libvo/font_load_ft.c mplayer-20070622/libvo/font_load_ft.c
+--- mplayer.orig/libvo/font_load_ft.c 2007-05-21 00:10:45.000000000 +0800
++++ mplayer-20070622/libvo/font_load_ft.c 2007-08-04 17:46:43.000000000 +0800
+@@ -15,6 +15,7 @@
+ #include <stdlib.h>
+ #include <math.h>
+ #include <string.h>
++#include "fastmemset.h"
+
+ #ifdef USE_ICONV
+ #include <iconv.h>
+diff -urN -x .git mplayer.orig/libvo/geometry.c mplayer-20070622/libvo/geometry.c
+--- mplayer.orig/libvo/geometry.c 2005-04-06 19:57:10.000000000 +0800
++++ mplayer-20070622/libvo/geometry.c 2007-08-04 17:46:43.000000000 +0800
+@@ -2,6 +2,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include "geometry.h"
+ #include "mp_msg.h"
+
+diff -urN -x .git mplayer.orig/libvo/gl_common.c mplayer-20070622/libvo/gl_common.c
+--- mplayer.orig/libvo/gl_common.c 2007-03-11 22:59:08.000000000 +0800
++++ mplayer-20070622/libvo/gl_common.c 2007-08-04 17:46:43.000000000 +0800
+@@ -11,6 +11,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <ctype.h>
+ #include <math.h>
+ #include "gl_common.h"
+diff -urN -x .git mplayer.orig/libvo/godson_memcpy.S mplayer-20070622/libvo/godson_memcpy.S
+--- mplayer.orig/libvo/godson_memcpy.S 1970-01-01 08:00:00.000000000 +0800
++++ mplayer-20070622/libvo/godson_memcpy.S 2007-08-04 16:45:16.000000000 +0800
@@ -0,0 +1,145 @@
+/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -5429,22 +6928,522 @@ diff -urN mplayer-20070622.orig/libvo/godson_memcpy.S mplayer-20070622/libvo/god
+ .set reorder
+ .end godson_memcpy
+/* END (memcpy) */
-diff -urN mplayer-20070622.orig/libvo/Makefile mplayer-20070622/libvo/Makefile
---- mplayer-20070622.orig/libvo/Makefile 2007-04-23 04:19:00.000000000 +0800
-+++ mplayer-20070622/libvo/Makefile 2007-08-04 07:51:11.000000000 +0800
+diff -urN -x .git mplayer.orig/libvo/godson_memset.c mplayer-20070622/libvo/godson_memset.c
+--- mplayer.orig/libvo/godson_memset.c 1970-01-01 08:00:00.000000000 +0800
++++ mplayer-20070622/libvo/godson_memset.c 2007-08-04 17:46:44.000000000 +0800
+@@ -0,0 +1,169 @@
++void *godson_memset(void *s, int c, int n)
++{
++ register int i;
++ unsigned char c0 = (unsigned char)c;
++ unsigned short c1;
++ unsigned int c2;
++ unsigned long long c3;
++ if ( ((unsigned int)(s+n) & ~0x7) >= (((unsigned int)s & ~0x7) + 8)) {
++ c1 = ((unsigned short)c0 << 8) | c0;
++ c2 = ((unsigned int)c1 << 16) | c1;
++ c3 = ((unsigned long long)c2 << 32) | c2;
++ switch ((unsigned int)s & 0x7) {
++ case 1:
++ *(unsigned char *)(s) = c0;
++ *(unsigned short *)(s+1) = c1;
++ *(unsigned int *)(s+3) = c2;
++ break;
++ case 2:
++ *(unsigned short *)(s) = c1;
++ *(unsigned int *)(s+2) = c2;
++ break;
++ case 3:
++ *(unsigned char *)(s) = c0;
++ *(unsigned int *)(s+1) = c2;
++ break;
++ case 4:
++ *(unsigned int *)(s) = c2;
++ break;
++ case 5:
++ *(unsigned char *)(s) = c0;
++ *(unsigned short *)(s+1) = c1;
++ break;
++ case 6:
++ *(unsigned short *)(s) = c1;
++ break;
++ case 7:
++ *(unsigned char *)(s) = c0;
++ break;
++ }
++ switch ((unsigned int)(s+n) & 0x7) {
++ case 1:
++ *(unsigned char *)(s+n-1) = c0;
++ break;
++ case 2:
++ *(unsigned short *)(s+n-2) = c1;
++ break;
++ case 3:
++ *(unsigned char *)(s+n-1) = c0;
++ *(unsigned short *)(s+n-3) = c1;
++ break;
++ case 4:
++ *(unsigned int *)(s+n-4) = c2;
++ break;
++ case 5:
++ *(unsigned char *)(s+n-1) = c0;
++ *(unsigned int *)(s+n-5) = c2;
++ break;
++ case 6:
++ *(unsigned short *)(s+n-2) = c1;
++ *(unsigned int *)(s+n-6) = c2;
++ break;
++ case 7:
++ *(unsigned char *)(s+n-1) = c0;
++ *(unsigned short *)(s+n-3) = c1;
++ *(unsigned int *)(s+n-7) = c2;
++ break;
++ }
++
++ void *tmp = (void *)((unsigned int)(s+7)&~0x7);
++ asm (
++ ".set mips3\n\t"
++ "ldc1 $f16,%0\n\t"
++ ".set mips1\n\t"
++ :
++ :"m"(c3)
++ );
++
++
++ for (n = (((unsigned int)(s+n)&~0x7) - (((unsigned int)(s+7)&~0x7))); n > 0;) {
++ if (n >= 128) {
++ asm (
++ ".set mips3\n\t"
++ "sdc1 $f16,0(%0)\n\t"
++ "sdc1 $f16,0x8(%0)\n\t"
++ "sdc1 $f16,0x10(%0)\n\t"
++ "sdc1 $f16,0x18(%0)\n\t"
++ "sdc1 $f16,0x20(%0)\n\t"
++ "sdc1 $f16,0x28(%0)\n\t"
++ "sdc1 $f16,0x30(%0)\n\t"
++ "sdc1 $f16,0x38(%0)\n\t"
++ "sdc1 $f16,0x40(%0)\n\t"
++ "sdc1 $f16,0x48(%0)\n\t"
++ "sdc1 $f16,0x50(%0)\n\t"
++ "sdc1 $f16,0x58(%0)\n\t"
++ "sdc1 $f16,0x60(%0)\n\t"
++ "sdc1 $f16,0x68(%0)\n\t"
++ "sdc1 $f16,0x70(%0)\n\t"
++ "sdc1 $f16,0x78(%0)\n\t"
++ ".set mips1\n\t"
++ :
++ :"r"(tmp)
++ );
++ tmp += 128;
++ n -= 128;
++ continue;
++ }
++ if (n >= 64) {
++ asm (
++ ".set mips3\n\t"
++ "sdc1 $f16,0(%0)\n\t"
++ "sdc1 $f16,0x8(%0)\n\t"
++ "sdc1 $f16,0x10(%0)\n\t"
++ "sdc1 $f16,0x18(%0)\n\t"
++ "sdc1 $f16,0x20(%0)\n\t"
++ "sdc1 $f16,0x28(%0)\n\t"
++ "sdc1 $f16,0x30(%0)\n\t"
++ "sdc1 $f16,0x38(%0)\n\t"
++ ".set mips1\n\t"
++ :
++ :"r"(tmp)
++ );
++
++ tmp += 64;
++ n -= 64;
++ continue;
++ }
++ if (n >= 32) {
++ asm (
++ ".set mips3\n\t"
++ "sdc1 $f16,0(%0)\n\t"
++ "sdc1 $f16,0x8(%0)\n\t"
++ "sdc1 $f16,0x10(%0)\n\t"
++ "sdc1 $f16,0x18(%0)\n\t"
++ ".set mips1\n\t"
++ :
++ :"r"(tmp)
++ );
++ tmp += 32;
++ n -= 32;
++ continue;
++ }
++ if (n >= 16) {
++ asm (
++ ".set mips3\n\t"
++ "sdc1 $f16,0(%0)\n\t"
++ "sdc1 $f16,0x8(%0)\n\t"
++ ".set mips1\n\t"
++ :
++ :"r"(tmp)
++ );
++ tmp += 16;
++ n -= 16;
++ continue;
++ }
++ asm (
++ ".set mips3\n\t"
++ "sdc1 $f16,0(%0)\n\t"
++ ".set mips1\n\t"
++ :
++ :"r"(tmp)
++ );
++ n -= 8;
++ }
++ } else {
++ for (;n>0;n--)
++ *(unsigned char *)(s+n-1) = c0;
++ }
++ return s;
++}
+diff -urN -x .git mplayer.orig/libvo/Makefile mplayer-20070622/libvo/Makefile
+--- mplayer.orig/libvo/Makefile 2007-08-04 14:58:31.000000000 +0800
++++ mplayer-20070622/libvo/Makefile 2007-08-04 17:29:36.000000000 +0800
@@ -10,6 +10,8 @@
vo_mpegpes.c \
vo_null.c \
vo_yuv4mpeg.c \
-+ godson_memcpy.S \
-+ godson_memcpy.S \
++ godson_memcpy.S \
++ godson_memset.c \
$(VO_SRCS) \
SRCS_MPLAYER-$(VIDIX) += vosub_vidix.c
-diff -urN mplayer-20070622.orig/libvo/vosub_vidix.c mplayer-20070622/libvo/vosub_vidix.c
---- mplayer-20070622.orig/libvo/vosub_vidix.c 2006-04-24 12:23:53.000000000 +0800
-+++ mplayer-20070622/libvo/vosub_vidix.c 2007-08-04 07:39:59.000000000 +0800
-@@ -100,8 +100,14 @@
+diff -urN -x .git mplayer.orig/libvo/sub.c mplayer-20070622/libvo/sub.c
+--- mplayer.orig/libvo/sub.c 2007-06-21 16:18:51.000000000 +0800
++++ mplayer-20070622/libvo/sub.c 2007-08-04 17:46:44.000000000 +0800
+@@ -2,6 +2,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+
+ #include "config.h"
+ #ifdef HAVE_MALLOC_H
+diff -urN -x .git mplayer.orig/libvo/vesa_lvo.c mplayer-20070622/libvo/vesa_lvo.c
+--- mplayer.orig/libvo/vesa_lvo.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libvo/vesa_lvo.c 2007-08-04 17:46:44.000000000 +0800
+@@ -18,6 +18,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libvo/video_out.c mplayer-20070622/libvo/video_out.c
+--- mplayer.orig/libvo/video_out.c 2007-02-25 22:35:53.000000000 +0800
++++ mplayer-20070622/libvo/video_out.c 2007-08-04 17:46:44.000000000 +0800
+@@ -5,6 +5,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+
+ #include <unistd.h>
+ //#include <sys/mman.h>
+diff -urN -x .git mplayer.orig/libvo/vo_3dfx.c mplayer-20070622/libvo/vo_3dfx.c
+--- mplayer.orig/libvo/vo_3dfx.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libvo/vo_3dfx.c 2007-08-04 17:46:44.000000000 +0800
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libvo/vo_aa.c mplayer-20070622/libvo/vo_aa.c
+--- mplayer.orig/libvo/vo_aa.c 2007-03-30 01:16:11.000000000 +0800
++++ mplayer-20070622/libvo/vo_aa.c 2007-08-04 17:46:57.000000000 +0800
+@@ -21,6 +21,7 @@
+ #include <stdarg.h>
+ #include <time.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <errno.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libvo/vo_bl.c mplayer-20070622/libvo/vo_bl.c
+--- mplayer.orig/libvo/vo_bl.c 2007-06-05 23:09:49.000000000 +0800
++++ mplayer-20070622/libvo/vo_bl.c 2007-08-04 17:46:44.000000000 +0800
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <errno.h>
+diff -urN -x .git mplayer.orig/libvo/vo_caca.c mplayer-20070622/libvo/vo_caca.c
+--- mplayer.orig/libvo/vo_caca.c 2007-03-30 01:16:11.000000000 +0800
++++ mplayer-20070622/libvo/vo_caca.c 2007-08-04 17:46:44.000000000 +0800
+@@ -16,6 +16,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <time.h>
+ #include <errno.h>
+
+diff -urN -x .git mplayer.orig/libvo/vo_cvidix.c mplayer-20070622/libvo/vo_cvidix.c
+--- mplayer.orig/libvo/vo_cvidix.c 2006-10-09 00:40:11.000000000 +0800
++++ mplayer-20070622/libvo/vo_cvidix.c 2007-08-04 17:46:44.000000000 +0800
+@@ -11,6 +11,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <math.h>
+ #include <errno.h>
+
+diff -urN -x .git mplayer.orig/libvo/vo_dfbmga.c mplayer-20070622/libvo/vo_dfbmga.c
+--- mplayer.orig/libvo/vo_dfbmga.c 2007-03-30 01:16:11.000000000 +0800
++++ mplayer-20070622/libvo/vo_dfbmga.c 2007-08-04 17:46:44.000000000 +0800
+@@ -31,6 +31,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+
+ #include "config.h"
+ #include "video_out.h"
+diff -urN -x .git mplayer.orig/libvo/vo_dga.c mplayer-20070622/libvo/vo_dga.c
+--- mplayer.orig/libvo/vo_dga.c 2006-07-10 00:01:36.000000000 +0800
++++ mplayer-20070622/libvo/vo_dga.c 2007-08-04 17:46:44.000000000 +0800
+@@ -13,6 +13,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <errno.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libvo/vo_directfb2.c mplayer-20070622/libvo/vo_directfb2.c
+--- mplayer.orig/libvo/vo_directfb2.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libvo/vo_directfb2.c 2007-08-04 17:46:44.000000000 +0800
+@@ -32,6 +32,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+
+ #ifdef __linux__
+ #include <sys/kd.h>
+diff -urN -x .git mplayer.orig/libvo/vo_dxr2.c mplayer-20070622/libvo/vo_dxr2.c
+--- mplayer.orig/libvo/vo_dxr2.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libvo/vo_dxr2.c 2007-08-04 17:46:45.000000000 +0800
+@@ -3,6 +3,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+diff -urN -x .git mplayer.orig/libvo/vo_dxr3.c mplayer-20070622/libvo/vo_dxr3.c
+--- mplayer.orig/libvo/vo_dxr3.c 2007-06-05 23:09:49.000000000 +0800
++++ mplayer-20070622/libvo/vo_dxr3.c 2007-08-04 17:46:45.000000000 +0800
+@@ -124,6 +124,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <fcntl.h>
+ #include <stdio.h>
+ #include <time.h>
+diff -urN -x .git mplayer.orig/libvo/vo_fbdev2.c mplayer-20070622/libvo/vo_fbdev2.c
+--- mplayer.orig/libvo/vo_fbdev2.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libvo/vo_fbdev2.c 2007-08-04 17:46:45.000000000 +0800
+@@ -7,6 +7,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <errno.h>
+diff -urN -x .git mplayer.orig/libvo/vo_fbdev.c mplayer-20070622/libvo/vo_fbdev.c
+--- mplayer.orig/libvo/vo_fbdev.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libvo/vo_fbdev.c 2007-08-04 17:46:45.000000000 +0800
+@@ -10,6 +10,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <errno.h>
+diff -urN -x .git mplayer.orig/libvo/vo_ggi.c mplayer-20070622/libvo/vo_ggi.c
+--- mplayer.orig/libvo/vo_ggi.c 2007-05-28 05:13:10.000000000 +0800
++++ mplayer-20070622/libvo/vo_ggi.c 2007-08-04 17:46:45.000000000 +0800
+@@ -17,6 +17,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <errno.h>
+
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libvo/vo_gif89a.c mplayer-20070622/libvo/vo_gif89a.c
+--- mplayer.orig/libvo/vo_gif89a.c 2006-09-01 20:11:11.000000000 +0800
++++ mplayer-20070622/libvo/vo_gif89a.c 2007-08-04 17:46:45.000000000 +0800
+@@ -50,6 +50,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <unistd.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libvo/vo_gl2.c mplayer-20070622/libvo/vo_gl2.c
+--- mplayer.orig/libvo/vo_gl2.c 2007-04-23 15:42:42.000000000 +0800
++++ mplayer-20070622/libvo/vo_gl2.c 2007-08-04 17:46:45.000000000 +0800
+@@ -7,6 +7,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libvo/vo_gl.c mplayer-20070622/libvo/vo_gl.c
+--- mplayer.orig/libvo/vo_gl.c 2007-06-09 17:25:41.000000000 +0800
++++ mplayer-20070622/libvo/vo_gl.c 2007-08-04 17:46:45.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <math.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libvo/vo_ivtv.c mplayer-20070622/libvo/vo_ivtv.c
+--- mplayer.orig/libvo/vo_ivtv.c 2007-02-27 03:08:29.000000000 +0800
++++ mplayer-20070622/libvo/vo_ivtv.c 2007-08-04 17:46:45.000000000 +0800
+@@ -26,6 +26,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+diff -urN -x .git mplayer.orig/libvo/vo_jpeg.c mplayer-20070622/libvo/vo_jpeg.c
+--- mplayer.orig/libvo/vo_jpeg.c 2006-07-08 23:26:36.000000000 +0800
++++ mplayer-20070622/libvo/vo_jpeg.c 2007-08-04 17:46:45.000000000 +0800
+@@ -22,6 +22,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <errno.h>
+ #include <jpeglib.h>
+ #include <sys/stat.h>
+diff -urN -x .git mplayer.orig/libvo/vo_md5sum.c mplayer-20070622/libvo/vo_md5sum.c
+--- mplayer.orig/libvo/vo_md5sum.c 2006-07-08 23:26:36.000000000 +0800
++++ mplayer-20070622/libvo/vo_md5sum.c 2007-08-04 17:46:45.000000000 +0800
+@@ -26,6 +26,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <errno.h>
+
+ /* ------------------------------------------------------------------------- */
+diff -urN -x .git mplayer.orig/libvo/vo_mga.c mplayer-20070622/libvo/vo_mga.c
+--- mplayer.orig/libvo/vo_mga.c 2006-04-24 12:23:53.000000000 +0800
++++ mplayer-20070622/libvo/vo_mga.c 2007-08-04 17:46:45.000000000 +0800
+@@ -5,6 +5,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libvo/vo_mpegpes.c mplayer-20070622/libvo/vo_mpegpes.c
+--- mplayer.orig/libvo/vo_mpegpes.c 2006-07-27 05:40:43.000000000 +0800
++++ mplayer-20070622/libvo/vo_mpegpes.c 2007-08-04 17:46:45.000000000 +0800
+@@ -16,6 +16,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+diff -urN -x .git mplayer.orig/libvo/vo_null.c mplayer-20070622/libvo/vo_null.c
+--- mplayer.orig/libvo/vo_null.c 2007-01-22 16:02:06.000000000 +0800
++++ mplayer-20070622/libvo/vo_null.c 2007-08-04 17:46:45.000000000 +0800
+@@ -23,6 +23,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <errno.h>
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libvo/vo_png.c mplayer-20070622/libvo/vo_png.c
+--- mplayer.orig/libvo/vo_png.c 2006-07-08 23:26:36.000000000 +0800
++++ mplayer-20070622/libvo/vo_png.c 2007-08-04 17:46:45.000000000 +0800
+@@ -10,6 +10,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <errno.h>
+
+ #include <png.h>
+diff -urN -x .git mplayer.orig/libvo/vo_pnm.c mplayer-20070622/libvo/vo_pnm.c
+--- mplayer.orig/libvo/vo_pnm.c 2006-07-08 23:26:36.000000000 +0800
++++ mplayer-20070622/libvo/vo_pnm.c 2007-08-04 17:46:45.000000000 +0800
+@@ -27,6 +27,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <errno.h>
+ #include <sys/stat.h>
+
+diff -urN -x .git mplayer.orig/libvo/vo_s3fb.c mplayer-20070622/libvo/vo_s3fb.c
+--- mplayer.orig/libvo/vo_s3fb.c 2006-07-02 11:59:36.000000000 +0800
++++ mplayer-20070622/libvo/vo_s3fb.c 2007-08-04 17:46:46.000000000 +0800
+@@ -12,6 +12,7 @@
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+ #include <fcntl.h>
+diff -urN -x .git mplayer.orig/libvo/vo_sdl.c mplayer-20070622/libvo/vo_sdl.c
+--- mplayer.orig/libvo/vo_sdl.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libvo/vo_sdl.c 2007-08-04 17:46:46.000000000 +0800
+@@ -103,6 +103,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <inttypes.h>
+
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libvo/vosub_vidix.c mplayer-20070622/libvo/vosub_vidix.c
+--- mplayer.orig/libvo/vosub_vidix.c 2007-08-04 14:58:31.000000000 +0800
++++ mplayer-20070622/libvo/vosub_vidix.c 2007-08-04 17:46:46.000000000 +0800
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <errno.h>
+
+ #include "config.h"
+@@ -100,8 +101,14 @@
/* Plane Y */
dest = vidix_mem + vidix_play.offsets[next_frame] + vidix_play.offset.y;
@@ -5461,7 +7460,7 @@ diff -urN mplayer-20070622.orig/libvo/vosub_vidix.c mplayer-20070622/libvo/vosub
for(i=0;i<h;i++){
memcpy(dest,src,w);
src+=stride[0];
-@@ -113,11 +119,23 @@
+@@ -113,11 +120,23 @@
int hi,wi;
uint8_t *src2;
dest = vidix_mem + vidix_play.offsets[next_frame] + vidix_play.offset.v;
@@ -5486,7 +7485,7 @@ diff -urN mplayer-20070622.orig/libvo/vosub_vidix.c mplayer-20070622/libvo/vosub
for(hi = 0; hi < h; hi++)
{
for(wi = 0; wi < w; wi++)
-@@ -134,8 +152,15 @@
+@@ -134,8 +153,15 @@
{
/* Plane V */
dest = vidix_mem + vidix_play.offsets[next_frame] + vidix_play.offset.v;
@@ -5504,7 +7503,7 @@ diff -urN mplayer-20070622.orig/libvo/vosub_vidix.c mplayer-20070622/libvo/vosub
for(i=0;i<h/2;i++){
memcpy(dest,src,w/2);
src+=stride[1];
-@@ -144,8 +169,15 @@
+@@ -144,8 +170,15 @@
/* Plane U */
dest = vidix_mem + vidix_play.offsets[next_frame] + vidix_play.offset.u;
@@ -5522,7 +7521,7 @@ diff -urN mplayer-20070622.orig/libvo/vosub_vidix.c mplayer-20070622/libvo/vosub
for(i=0;i<h/2;i++){
memcpy(dest,src,w/2);
src+=stride[2];
-@@ -510,7 +542,7 @@
+@@ -510,7 +543,7 @@
/* HACK: use draw_alpha to clear Y component */
for (i = 0; i < vidix_play.num_frames; i++) {
next_frame = i;
@@ -5531,37 +7530,349 @@ diff -urN mplayer-20070622.orig/libvo/vosub_vidix.c mplayer-20070622/libvo/vosub
vidix_play.frame_size);
draw_alpha(0, 0, image_width, image_height, tmp, tmpa, image_width);
}
-diff -urN mplayer-20070622.orig/libvo/x11_common.c mplayer-20070622/libvo/x11_common.c
---- mplayer-20070622.orig/libvo/x11_common.c 2007-04-23 15:42:42.000000000 +0800
-+++ mplayer-20070622/libvo/x11_common.c 2007-08-04 07:39:59.000000000 +0800
-@@ -75,6 +75,7 @@
- static int kdescreensaver_was_running = 0;
+diff -urN -x .git mplayer.orig/libvo/vo_svga.c mplayer-20070622/libvo/vo_svga.c
+--- mplayer.orig/libvo/vo_svga.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libvo/vo_svga.c 2007-08-04 17:46:46.000000000 +0800
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
- char *mDisplayName = NULL;
-+
- Display *mDisplay = NULL;
- Window mRootWin;
- int mScreen;
-@@ -2021,6 +2022,7 @@
+ #include <vga.h>
- uint32_t vo_x11_set_equalizer(char *name, int value)
- {
-+
- float gamma, brightness, contrast;
- float rf, gf, bf;
- int k;
-diff -urN mplayer-20070622.orig/mplayer.c mplayer-20070622/mplayer.c
---- mplayer-20070622.orig/mplayer.c 2007-06-21 16:18:51.000000000 +0800
-+++ mplayer-20070622/mplayer.c 2007-08-04 07:47:32.000000000 +0800
-@@ -13,6 +13,7 @@
+diff -urN -x .git mplayer.orig/libvo/vo_syncfb.c mplayer-20070622/libvo/vo_syncfb.c
+--- mplayer.orig/libvo/vo_syncfb.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libvo/vo_syncfb.c 2007-08-04 17:46:46.000000000 +0800
+@@ -27,6 +27,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <errno.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libvo/vo_tdfxfb.c mplayer-20070622/libvo/vo_tdfxfb.c
+--- mplayer.orig/libvo/vo_tdfxfb.c 2006-04-29 07:06:42.000000000 +0800
++++ mplayer-20070622/libvo/vo_tdfxfb.c 2007-08-04 17:46:46.000000000 +0800
+@@ -31,6 +31,7 @@
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+ #include <fcntl.h>
+diff -urN -x .git mplayer.orig/libvo/vo_tdfx_vid.c mplayer-20070622/libvo/vo_tdfx_vid.c
+--- mplayer.orig/libvo/vo_tdfx_vid.c 2007-01-22 16:02:06.000000000 +0800
++++ mplayer-20070622/libvo/vo_tdfx_vid.c 2007-08-04 17:46:46.000000000 +0800
+@@ -23,6 +23,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+diff -urN -x .git mplayer.orig/libvo/vo_tga.c mplayer-20070622/libvo/vo_tga.c
+--- mplayer.orig/libvo/vo_tga.c 2007-01-29 00:36:41.000000000 +0800
++++ mplayer-20070622/libvo/vo_tga.c 2007-08-04 17:46:46.000000000 +0800
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <errno.h>
+ #include <math.h>
+
+diff -urN -x .git mplayer.orig/libvo/vo_vesa.c mplayer-20070622/libvo/vo_vesa.c
+--- mplayer.orig/libvo/vo_vesa.c 2007-06-05 23:09:49.000000000 +0800
++++ mplayer-20070622/libvo/vo_vesa.c 2007-08-04 17:46:46.000000000 +0800
+@@ -24,6 +24,7 @@
+ #endif
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <stddef.h>
+ #include <limits.h>
+ #include <unistd.h>
+diff -urN -x .git mplayer.orig/libvo/vo_winvidix.c mplayer-20070622/libvo/vo_winvidix.c
+--- mplayer.orig/libvo/vo_winvidix.c 2007-03-30 01:16:11.000000000 +0800
++++ mplayer-20070622/libvo/vo_winvidix.c 2007-08-04 17:46:46.000000000 +0800
+@@ -9,6 +9,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <math.h>
+ #include <errno.h>
+
+diff -urN -x .git mplayer.orig/libvo/vo_x11.c mplayer-20070622/libvo/vo_x11.c
+--- mplayer.orig/libvo/vo_x11.c 2007-05-28 16:42:35.000000000 +0800
++++ mplayer-20070622/libvo/vo_x11.c 2007-08-04 17:46:46.000000000 +0800
+@@ -2,6 +2,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <signal.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libvo/vo_xmga.c mplayer-20070622/libvo/vo_xmga.c
+--- mplayer.orig/libvo/vo_xmga.c 2007-04-23 15:42:42.000000000 +0800
++++ mplayer-20070622/libvo/vo_xmga.c 2007-08-04 17:46:46.000000000 +0800
+@@ -11,6 +11,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+
+ #include "config.h"
+
+diff -urN -x .git mplayer.orig/libvo/vo_xover.c mplayer-20070622/libvo/vo_xover.c
+--- mplayer.orig/libvo/vo_xover.c 2007-04-23 15:42:42.000000000 +0800
++++ mplayer-20070622/libvo/vo_xover.c 2007-08-04 17:46:46.000000000 +0800
+@@ -12,6 +12,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <math.h>
+ #include <errno.h>
+ #include <unistd.h>
+diff -urN -x .git mplayer.orig/libvo/vo_xv.c mplayer-20070622/libvo/vo_xv.c
+--- mplayer.orig/libvo/vo_xv.c 2007-04-23 15:42:42.000000000 +0800
++++ mplayer-20070622/libvo/vo_xv.c 2007-08-04 17:46:46.000000000 +0800
+@@ -19,6 +19,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/libvo/vo_xvidix.c mplayer-20070622/libvo/vo_xvidix.c
+--- mplayer.orig/libvo/vo_xvidix.c 2007-04-23 15:42:42.000000000 +0800
++++ mplayer-20070622/libvo/vo_xvidix.c 2007-08-04 17:46:46.000000000 +0800
+@@ -11,6 +11,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <math.h>
+ #include <errno.h>
+
+diff -urN -x .git mplayer.orig/libvo/vo_xvmc.c mplayer-20070622/libvo/vo_xvmc.c
+--- mplayer.orig/libvo/vo_xvmc.c 2007-05-28 05:13:10.000000000 +0800
++++ mplayer-20070622/libvo/vo_xvmc.c 2007-08-04 17:46:46.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <unistd.h>
+
+ #include "config.h"
+diff -urN -x .git mplayer.orig/libvo/vo_yuv4mpeg.c mplayer-20070622/libvo/vo_yuv4mpeg.c
+--- mplayer.orig/libvo/vo_yuv4mpeg.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libvo/vo_yuv4mpeg.c 2007-08-04 17:46:46.000000000 +0800
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <unistd.h>
+ #include <errno.h>
+ #include <fcntl.h>
+diff -urN -x .git mplayer.orig/libvo/vo_zr2.c mplayer-20070622/libvo/vo_zr2.c
+--- mplayer.orig/libvo/vo_zr2.c 2007-06-05 23:09:49.000000000 +0800
++++ mplayer-20070622/libvo/vo_zr2.c 2007-08-04 17:46:47.000000000 +0800
+@@ -9,6 +9,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <errno.h>
+diff -urN -x .git mplayer.orig/libvo/vo_zr.c mplayer-20070622/libvo/vo_zr.c
+--- mplayer.orig/libvo/vo_zr.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/libvo/vo_zr.c 2007-08-04 17:46:47.000000000 +0800
+@@ -8,6 +8,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "fastmemset.h"
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <errno.h>
+diff -urN -x .git mplayer.orig/libvo/x11_common.c mplayer-20070622/libvo/x11_common.c
+--- mplayer.orig/libvo/x11_common.c 2007-08-04 14:58:31.000000000 +0800
++++ mplayer-20070622/libvo/x11_common.c 2007-08-04 17:46:47.000000000 +0800
+@@ -12,6 +12,7 @@
+ #ifdef X11_FULLSCREEN
+
+ #include <string.h>
++#include "fastmemset.h"
+ #include <unistd.h>
+ #include <signal.h>
+ #include <assert.h>
+diff -urN -x .git mplayer.orig/loader/afl.c mplayer-20070622/loader/afl.c
+--- mplayer.orig/loader/afl.c 2006-11-27 02:33:41.000000000 +0800
++++ mplayer-20070622/loader/afl.c 2007-08-04 17:54:11.000000000 +0800
+@@ -43,6 +43,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #pragma pack(1)
+ #define OpenDriverA DrvOpen
+ #define CloseDriver DrvClose
+diff -urN -x .git mplayer.orig/loader/elfdll.c mplayer-20070622/loader/elfdll.c
+--- mplayer.orig/loader/elfdll.c 2006-06-22 21:34:00.000000000 +0800
++++ mplayer-20070622/loader/elfdll.c 2007-08-04 17:54:11.000000000 +0800
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <ctype.h>
+ #include <dlfcn.h>
+
+diff -urN -x .git mplayer.orig/loader/ext.c mplayer-20070622/loader/ext.c
+--- mplayer.orig/loader/ext.c 2007-03-04 17:04:45.000000000 +0800
++++ mplayer-20070622/loader/ext.c 2007-08-04 17:54:11.000000000 +0800
+@@ -23,6 +23,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <stdarg.h>
+ #include <ctype.h>
+
+diff -urN -x .git mplayer.orig/loader/ldt_keeper.c mplayer-20070622/loader/ldt_keeper.c
+--- mplayer.orig/loader/ldt_keeper.c 2007-03-19 06:18:11.000000000 +0800
++++ mplayer-20070622/loader/ldt_keeper.c 2007-08-04 17:54:11.000000000 +0800
+@@ -21,6 +21,7 @@
+ #include "ldt_keeper.h"
+
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <fcntl.h>
+diff -urN -x .git mplayer.orig/loader/module.c mplayer-20070622/loader/module.c
+--- mplayer.orig/loader/module.c 2006-11-27 10:44:06.000000000 +0800
++++ mplayer-20070622/loader/module.c 2007-08-04 17:54:11.000000000 +0800
+@@ -26,6 +26,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+ #include <sys/mman.h>
+ #include <inttypes.h>
+diff -urN -x .git mplayer.orig/loader/pe_image.c mplayer-20070622/loader/pe_image.c
+--- mplayer.orig/loader/pe_image.c 2006-11-27 02:33:41.000000000 +0800
++++ mplayer-20070622/loader/pe_image.c 2007-08-04 17:54:11.000000000 +0800
+@@ -46,6 +46,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+diff -urN -x .git mplayer.orig/loader/resource.c mplayer-20070622/loader/resource.c
+--- mplayer.orig/loader/resource.c 2006-11-27 02:33:41.000000000 +0800
++++ mplayer-20070622/loader/resource.c 2007-08-04 17:54:12.000000000 +0800
+@@ -16,6 +16,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+diff -urN -x .git mplayer.orig/loader/vfl.c mplayer-20070622/loader/vfl.c
+--- mplayer.orig/loader/vfl.c 2006-07-02 11:59:36.000000000 +0800
++++ mplayer-20070622/loader/vfl.c 2007-08-04 17:54:12.000000000 +0800
+@@ -11,6 +11,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "win32.h"
+ #include "loader.h"
+diff -urN -x .git mplayer.orig/m_config.c mplayer-20070622/m_config.c
+--- mplayer.orig/m_config.c 2006-11-20 01:41:31.000000000 +0800
++++ mplayer-20070622/m_config.c 2007-08-04 17:48:52.000000000 +0800
+@@ -8,6 +8,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #ifdef MP_DEBUG
+ #include <assert.h>
+ #endif
+diff -urN -x .git mplayer.orig/mencoder.c mplayer-20070622/mencoder.c
+--- mplayer.orig/mencoder.c 2007-06-06 00:13:00.000000000 +0800
++++ mplayer-20070622/mencoder.c 2007-08-04 17:48:52.000000000 +0800
+@@ -22,6 +22,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <signal.h>
+ #include "config.h"
+
+diff -urN -x .git mplayer.orig/mixer.c mplayer-20070622/mixer.c
+--- mplayer.orig/mixer.c 2007-06-20 10:26:20.000000000 +0800
++++ mplayer-20070622/mixer.c 2007-08-04 17:48:52.000000000 +0800
+@@ -1,4 +1,5 @@
#include <string.h>
++#include "libvo/fastmemset.h"
+ #ifndef __MINGW32__
+ #include <sys/ioctl.h>
+ #endif
+diff -urN -x .git mplayer.orig/m_option.c mplayer-20070622/m_option.c
+--- mplayer.orig/m_option.c 2007-06-02 01:29:35.000000000 +0800
++++ mplayer-20070622/m_option.c 2007-08-04 17:48:52.000000000 +0800
+@@ -6,6 +6,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <math.h>
+ #include <stdio.h>
+ #include <stdarg.h>
+diff -urN -x .git mplayer.orig/mp3lib/sr1.c mplayer-20070622/mp3lib/sr1.c
+--- mplayer.orig/mp3lib/sr1.c 2007-06-08 22:38:25.000000000 +0800
++++ mplayer-20070622/mp3lib/sr1.c 2007-08-04 17:54:13.000000000 +0800
+@@ -15,6 +15,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <signal.h>
+ #include <math.h>
+
+diff -urN -x .git mplayer.orig/mplayer.c mplayer-20070622/mplayer.c
+--- mplayer.orig/mplayer.c 2007-08-04 14:58:31.000000000 +0800
++++ mplayer-20070622/mplayer.c 2007-08-04 17:48:53.000000000 +0800
+@@ -11,8 +11,10 @@
+ #include <windows.h>
+ #endif
+ #include <string.h>
++#include "libvo/fastmemset.h"
#include <unistd.h>
+long long fp_registers[16];
// #include <sys/mman.h>
#include <sys/types.h>
#ifndef __MINGW32__
-@@ -1619,7 +1620,55 @@
+@@ -1619,7 +1621,55 @@
if (in_size > max_framesize)
max_framesize = in_size;
current_module = "decode video";
@@ -5617,20 +7928,310 @@ diff -urN mplayer-20070622.orig/mplayer.c mplayer-20070622/mplayer.c
if (decoded_frame) {
update_subtitles(sh_video, mpctx->d_sub, 0);
update_osd_msg();
-diff -urN mplayer-20070622.orig/stream/Makefile mplayer-20070622/stream/Makefile
---- mplayer-20070622.orig/stream/Makefile 2007-06-21 16:18:51.000000000 +0800
-+++ mplayer-20070622/stream/Makefile 2007-08-04 07:43:14.000000000 +0800
+diff -urN -x .git mplayer.orig/mp_msg.c mplayer-20070622/mp_msg.c
+--- mplayer.orig/mp_msg.c 2007-06-06 00:13:00.000000000 +0800
++++ mplayer-20070622/mp_msg.c 2007-08-04 17:48:53.000000000 +0800
+@@ -5,6 +5,7 @@
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+
+diff -urN -x .git mplayer.orig/m_property.c mplayer-20070622/m_property.c
+--- mplayer.orig/m_property.c 2007-05-31 20:42:02.000000000 +0800
++++ mplayer-20070622/m_property.c 2007-08-04 17:48:53.000000000 +0800
+@@ -7,6 +7,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <unistd.h>
+
+diff -urN -x .git mplayer.orig/m_struct.c mplayer-20070622/m_struct.c
+--- mplayer.orig/m_struct.c 2006-07-16 00:03:12.000000000 +0800
++++ mplayer-20070622/m_struct.c 2007-08-04 17:48:53.000000000 +0800
+@@ -6,6 +6,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "m_option.h"
+ #include "m_struct.h"
+diff -urN -x .git mplayer.orig/osdep/getch2.c mplayer-20070622/osdep/getch2.c
+--- mplayer.orig/osdep/getch2.c 2007-04-02 05:59:54.000000000 +0800
++++ mplayer-20070622/osdep/getch2.c 2007-08-04 17:54:13.000000000 +0800
+@@ -13,6 +13,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #ifdef USE_IOCTL
+diff -urN -x .git mplayer.orig/osdep/scandir.c mplayer-20070622/osdep/scandir.c
+--- mplayer.orig/osdep/scandir.c 2007-01-11 03:07:42.000000000 +0800
++++ mplayer-20070622/osdep/scandir.c 2007-08-04 17:54:13.000000000 +0800
+@@ -11,6 +11,7 @@
+ #include <stdlib.h>
+ #include <stddef.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ /*
+ * convenience helper function for scandir's |compar()| function:
+diff -urN -x .git mplayer.orig/osdep/setenv.c mplayer-20070622/osdep/setenv.c
+--- mplayer.orig/osdep/setenv.c 2007-01-11 03:07:42.000000000 +0800
++++ mplayer-20070622/osdep/setenv.c 2007-08-04 17:54:13.000000000 +0800
+@@ -4,6 +4,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #ifndef MP_DEBUG
+ #define NDEBUG
+ #endif
+diff -urN -x .git mplayer.orig/osdep/shmem.c mplayer-20070622/osdep/shmem.c
+--- mplayer.orig/osdep/shmem.c 2007-01-11 03:07:42.000000000 +0800
++++ mplayer-20070622/osdep/shmem.c 2007-08-04 17:54:13.000000000 +0800
+@@ -11,6 +11,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+ #include <errno.h>
+ #include <sys/types.h>
+diff -urN -x .git mplayer.orig/osdep/strsep.c mplayer-20070622/osdep/strsep.c
+--- mplayer.orig/osdep/strsep.c 2007-01-11 03:07:42.000000000 +0800
++++ mplayer-20070622/osdep/strsep.c 2007-08-04 17:54:13.000000000 +0800
+@@ -2,6 +2,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+
+diff -urN -x .git mplayer.orig/parser-cfg.c mplayer-20070622/parser-cfg.c
+--- mplayer.orig/parser-cfg.c 2007-01-05 00:06:01.000000000 +0800
++++ mplayer-20070622/parser-cfg.c 2007-08-04 17:48:53.000000000 +0800
+@@ -12,6 +12,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <errno.h>
+ #include <ctype.h>
+
+diff -urN -x .git mplayer.orig/parser-mecmd.c mplayer-20070622/parser-mecmd.c
+--- mplayer.orig/parser-mecmd.c 2006-11-27 23:46:36.000000000 +0800
++++ mplayer-20070622/parser-mecmd.c 2007-08-04 17:48:53.000000000 +0800
+@@ -7,6 +7,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <errno.h>
+
+ #ifdef MP_DEBUG
+diff -urN -x .git mplayer.orig/parser-mpcmd.c mplayer-20070622/parser-mpcmd.c
+--- mplayer.orig/parser-mpcmd.c 2006-11-27 23:46:36.000000000 +0800
++++ mplayer-20070622/parser-mpcmd.c 2007-08-04 17:48:53.000000000 +0800
+@@ -7,6 +7,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <errno.h>
+
+ #ifdef MP_DEBUG
+diff -urN -x .git mplayer.orig/playtree.c mplayer-20070622/playtree.c
+--- mplayer.orig/playtree.c 2006-07-03 22:52:07.000000000 +0800
++++ mplayer-20070622/playtree.c 2007-08-04 17:48:53.000000000 +0800
+@@ -5,6 +5,7 @@
+ #include "config.h"
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <errno.h>
+diff -urN -x .git mplayer.orig/playtreeparser.c mplayer-20070622/playtreeparser.c
+--- mplayer.orig/playtreeparser.c 2007-03-19 05:39:52.000000000 +0800
++++ mplayer-20070622/playtreeparser.c 2007-08-04 17:48:53.000000000 +0800
+@@ -6,6 +6,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #ifdef MP_DEBUG
+ #include <assert.h>
+ #endif
+diff -urN -x .git mplayer.orig/spudec.c mplayer-20070622/spudec.c
+--- mplayer.orig/spudec.c 2007-06-21 16:18:51.000000000 +0800
++++ mplayer-20070622/spudec.c 2007-08-04 17:48:53.000000000 +0800
+@@ -20,6 +20,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <math.h>
+ #include "libvo/video_out.h"
+ #include "spudec.h"
+diff -urN -x .git mplayer.orig/stream/ai_oss.c mplayer-20070622/stream/ai_oss.c
+--- mplayer.orig/stream/ai_oss.c 2006-08-01 01:39:17.000000000 +0800
++++ mplayer-20070622/stream/ai_oss.c 2007-08-04 17:54:13.000000000 +0800
+@@ -4,6 +4,7 @@
+ #include "config.h"
+
+ #include <string.h> /* strerror */
++#include "libvo/fastmemset.h"
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <sys/ioctl.h>
+diff -urN -x .git mplayer.orig/stream/asf_mmst_streaming.c mplayer-20070622/stream/asf_mmst_streaming.c
+--- mplayer.orig/stream/asf_mmst_streaming.c 2007-02-09 01:03:24.000000000 +0800
++++ mplayer-20070622/stream/asf_mmst_streaming.c 2007-08-04 17:54:13.000000000 +0800
+@@ -30,6 +30,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+ #include <errno.h>
+ #include <inttypes.h>
+diff -urN -x .git mplayer.orig/stream/asf_streaming.c mplayer-20070622/stream/asf_streaming.c
+--- mplayer.orig/stream/asf_streaming.c 2007-03-01 20:54:38.000000000 +0800
++++ mplayer-20070622/stream/asf_streaming.c 2007-08-04 17:54:13.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+ #include <errno.h>
+ #include <limits.h>
+diff -urN -x .git mplayer.orig/stream/audio_in.c mplayer-20070622/stream/audio_in.c
+--- mplayer.orig/stream/audio_in.c 2006-08-01 01:39:17.000000000 +0800
++++ mplayer-20070622/stream/audio_in.c 2007-08-04 17:54:13.000000000 +0800
+@@ -8,6 +8,7 @@
+ #include "mp_msg.h"
+ #include "help_mp.h"
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <errno.h>
+
+ // sanitizes ai structure before calling other functions
+diff -urN -x .git mplayer.orig/stream/cache2.c mplayer-20070622/stream/cache2.c
+--- mplayer.orig/stream/cache2.c 2007-02-06 07:46:08.000000000 +0800
++++ mplayer-20070622/stream/cache2.c 2007-08-04 17:54:13.000000000 +0800
+@@ -11,6 +11,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <signal.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+diff -urN -x .git mplayer.orig/stream/cdinfo.c mplayer-20070622/stream/cdinfo.c
+--- mplayer.orig/stream/cdinfo.c 2006-08-02 19:22:11.000000000 +0800
++++ mplayer-20070622/stream/cdinfo.c 2007-08-04 17:54:13.000000000 +0800
+@@ -9,6 +9,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include "mp_msg.h"
+ #include "help_mp.h"
+ #include "cdd.h"
+diff -urN -x .git mplayer.orig/stream/cookies.c mplayer-20070622/stream/cookies.c
+--- mplayer.orig/stream/cookies.c 2006-09-07 08:10:44.000000000 +0800
++++ mplayer-20070622/stream/cookies.c 2007-08-04 17:54:13.000000000 +0800
+@@ -9,6 +9,7 @@
+ #include <stdlib.h>
+ #include <fcntl.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <dirent.h>
+diff -urN -x .git mplayer.orig/stream/http.c mplayer-20070622/stream/http.c
+--- mplayer.orig/stream/http.c 2007-01-29 03:25:03.000000000 +0800
++++ mplayer-20070622/stream/http.c 2007-08-04 17:54:14.000000000 +0800
+@@ -9,6 +9,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #ifndef HAVE_WINSOCK2
+diff -urN -x .git mplayer.orig/stream/Makefile mplayer-20070622/stream/Makefile
+--- mplayer.orig/stream/Makefile 2007-08-04 14:58:31.000000000 +0800
++++ mplayer-20070622/stream/Makefile 2007-08-04 16:45:16.000000000 +0800
@@ -9,6 +9,7 @@
stream_mf.c \
stream_null.c \
url.c \
-+ safe-ctype.c
++ safe-ctype.c
SRCS_COMMON-$(CDDA) += stream_cdda.c cdinfo.c
SRCS_COMMON-$(CDDB) += stream_cddb.c
-diff -urN mplayer-20070622.orig/stream/safe-ctype.c mplayer-20070622/stream/safe-ctype.c
---- mplayer-20070622.orig/stream/safe-ctype.c 1970-01-01 08:00:00.000000000 +0800
-+++ mplayer-20070622/stream/safe-ctype.c 2007-08-04 07:39:59.000000000 +0800
+diff -urN -x .git mplayer.orig/stream/network.c mplayer-20070622/stream/network.c
+--- mplayer.orig/stream/network.c 2007-02-06 07:46:08.000000000 +0800
++++ mplayer-20070622/stream/network.c 2007-08-04 17:54:14.000000000 +0800
+@@ -9,6 +9,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include <errno.h>
+diff -urN -x .git mplayer.orig/stream/open.c mplayer-20070622/stream/open.c
+--- mplayer.orig/stream/open.c 2006-08-05 01:01:29.000000000 +0800
++++ mplayer-20070622/stream/open.c 2007-08-04 17:54:14.000000000 +0800
+@@ -3,9 +3,11 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/stream/pnm.c mplayer-20070622/stream/pnm.c
+--- mplayer.orig/stream/pnm.c 2006-09-01 20:11:11.000000000 +0800
++++ mplayer-20070622/stream/pnm.c 2007-08-04 17:54:14.000000000 +0800
+@@ -29,6 +29,7 @@
+ #include <stdio.h>
+ #include <assert.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <errno.h>
+diff -urN -x .git mplayer.orig/stream/rtp.c mplayer-20070622/stream/rtp.c
+--- mplayer.orig/stream/rtp.c 2006-08-05 03:36:41.000000000 +0800
++++ mplayer-20070622/stream/rtp.c 2007-08-04 17:54:14.000000000 +0800
+@@ -7,6 +7,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+diff -urN -x .git mplayer.orig/stream/safe-ctype.c mplayer-20070622/stream/safe-ctype.c
+--- mplayer.orig/stream/safe-ctype.c 1970-01-01 08:00:00.000000000 +0800
++++ mplayer-20070622/stream/safe-ctype.c 2007-08-04 17:54:14.000000000 +0800
@@ -0,0 +1,173 @@
+/* <ctype.h> replacement macros.
+
@@ -5805,9 +8406,9 @@ diff -urN mplayer-20070622.orig/stream/safe-ctype.c mplayer-20070622/stream/safe
+#else
+ #error "Unsupported host character set"
+#endif /* not ASCII */
-diff -urN mplayer-20070622.orig/stream/safe-ctype.h mplayer-20070622/stream/safe-ctype.h
---- mplayer-20070622.orig/stream/safe-ctype.h 1970-01-01 08:00:00.000000000 +0800
-+++ mplayer-20070622/stream/safe-ctype.h 2007-08-04 07:39:59.000000000 +0800
+diff -urN -x .git mplayer.orig/stream/safe-ctype.h mplayer-20070622/stream/safe-ctype.h
+--- mplayer.orig/stream/safe-ctype.h 1970-01-01 08:00:00.000000000 +0800
++++ mplayer-20070622/stream/safe-ctype.h 2007-08-04 17:54:14.000000000 +0800
@@ -0,0 +1,130 @@
+/* <ctype.h> replacement macros.
+
@@ -5939,30 +8540,263 @@ diff -urN mplayer-20070622.orig/stream/safe-ctype.h mplayer-20070622/stream/safe
+#define TOLOWER(c) _sch_tolower[(c) & 0xff]
+
+#endif /* SAFE_CTYPE_H */
-diff -urN mplayer-20070622.orig/stream/stream.h mplayer-20070622/stream/stream.h
---- mplayer-20070622.orig/stream/stream.h 2007-03-14 07:35:00.000000000 +0800
-+++ mplayer-20070622/stream/stream.h 2007-08-04 07:39:59.000000000 +0800
-@@ -2,10 +2,15 @@
- #define __STREAM_H
+diff -urN -x .git mplayer.orig/stream/stream_cddb.c mplayer-20070622/stream/stream_cddb.c
+--- mplayer.orig/stream/stream_cddb.c 2007-06-05 19:13:32.000000000 +0800
++++ mplayer-20070622/stream/stream_cddb.c 2007-08-04 17:54:14.000000000 +0800
+@@ -21,6 +21,7 @@
+ #include <errno.h>
+ #include <unistd.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #ifdef WIN32
+ #ifdef __MINGW32__
+ #define mkdir(a,b) mkdir(a)
+diff -urN -x .git mplayer.orig/stream/stream_cue.c mplayer-20070622/stream/stream_cue.c
+--- mplayer.orig/stream/stream_cue.c 2006-08-04 03:25:16.000000000 +0800
++++ mplayer-20070622/stream/stream_cue.c 2007-08-04 17:54:14.000000000 +0800
+@@ -3,6 +3,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+diff -urN -x .git mplayer.orig/stream/stream_dvb.c mplayer-20070622/stream/stream_dvb.c
+--- mplayer.orig/stream/stream_dvb.c 2007-06-08 15:45:36.000000000 +0800
++++ mplayer-20070622/stream/stream_dvb.c 2007-08-04 17:54:14.000000000 +0800
+@@ -31,6 +31,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <ctype.h>
+ #include <sys/ioctl.h>
+ #include <sys/time.h>
+diff -urN -x .git mplayer.orig/stream/stream_dvd.c mplayer-20070622/stream/stream_dvd.c
+--- mplayer.orig/stream/stream_dvd.c 2007-05-28 16:42:35.000000000 +0800
++++ mplayer-20070622/stream/stream_dvd.c 2007-08-04 17:54:14.000000000 +0800
+@@ -4,9 +4,11 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "mp_msg.h"
+diff -urN -x .git mplayer.orig/stream/stream_dvdnav.c mplayer-20070622/stream/stream_dvdnav.c
+--- mplayer.orig/stream/stream_dvdnav.c 2007-04-22 18:27:44.000000000 +0800
++++ mplayer-20070622/stream/stream_dvdnav.c 2007-08-04 17:54:14.000000000 +0800
+@@ -4,6 +4,7 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
#include "mp_msg.h"
--#include <string.h>
-+//#include <string.h>
+ #include "osdep/timer.h"
+ #include "input/input.h"
+diff -urN -x .git mplayer.orig/stream/stream.h mplayer-20070622/stream/stream.h
+--- mplayer.orig/stream/stream.h 2007-08-04 14:58:31.000000000 +0800
++++ mplayer-20070622/stream/stream.h 2007-08-04 17:54:14.000000000 +0800
+@@ -3,6 +3,7 @@
+
+ #include "mp_msg.h"
+ #include <string.h>
++#include "libvo/fastmemset.h"
#include <inttypes.h>
#include <sys/types.h>
-+#ifndef memcpy
-+extern void * godson_memcpy(void *,void *,int);
-+#define memcpy(a,b,c) godson_memcpy(a,b,c)
-+#endif
-+
- #define STREAMTYPE_DUMMY -1 // for placeholders, when the actual reading is handled in the demuxer
- #define STREAMTYPE_FILE 0 // read from seekable file
- #define STREAMTYPE_VCD 1 // raw mode-2 CDROM reading, 2324 bytes/sector
-diff -urN mplayer-20070622.orig/stream/url.c mplayer-20070622/stream/url.c
---- mplayer-20070622.orig/stream/url.c 2006-11-22 00:27:05.000000000 +0800
-+++ mplayer-20070622/stream/url.c 2007-08-04 07:39:59.000000000 +0800
-@@ -43,6 +43,208 @@
+diff -urN -x .git mplayer.orig/stream/stream_livedotcom.c mplayer-20070622/stream/stream_livedotcom.c
+--- mplayer.orig/stream/stream_livedotcom.c 2006-08-05 01:01:29.000000000 +0800
++++ mplayer-20070622/stream/stream_livedotcom.c 2007-08-04 17:54:14.000000000 +0800
+@@ -5,6 +5,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "stream.h"
+ #include "network.h"
+diff -urN -x .git mplayer.orig/stream/stream_mf.c mplayer-20070622/stream/stream_mf.c
+--- mplayer.orig/stream/stream_mf.c 2006-08-05 01:01:29.000000000 +0800
++++ mplayer-20070622/stream/stream_mf.c 2007-08-04 17:54:14.000000000 +0800
+@@ -21,6 +21,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "stream.h"
+ #include "libmpdemux/demuxer.h"
+diff -urN -x .git mplayer.orig/stream/stream_null.c mplayer-20070622/stream/stream_null.c
+--- mplayer.orig/stream/stream_null.c 2006-08-05 01:01:29.000000000 +0800
++++ mplayer-20070622/stream/stream_null.c 2007-08-04 17:54:14.000000000 +0800
+@@ -3,6 +3,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "stream.h"
+
+diff -urN -x .git mplayer.orig/stream/stream_pvr.c mplayer-20070622/stream/stream_pvr.c
+--- mplayer.orig/stream/stream_pvr.c 2007-05-08 20:21:50.000000000 +0800
++++ mplayer-20070622/stream/stream_pvr.c 2007-08-04 17:54:15.000000000 +0800
+@@ -27,6 +27,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <ctype.h>
+ #include <sys/time.h>
+ #include <errno.h>
+diff -urN -x .git mplayer.orig/stream/stream_radio.c mplayer-20070622/stream/stream_radio.c
+--- mplayer.orig/stream/stream_radio.c 2007-06-08 14:08:51.000000000 +0800
++++ mplayer-20070622/stream/stream_radio.c 2007-08-04 17:54:15.000000000 +0800
+@@ -30,6 +30,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/ioctl.h>
+ #include <errno.h>
+ #include <unistd.h>
+diff -urN -x .git mplayer.orig/stream/stream_rtp.c mplayer-20070622/stream/stream_rtp.c
+--- mplayer.orig/stream/stream_rtp.c 2006-08-05 03:31:53.000000000 +0800
++++ mplayer-20070622/stream/stream_rtp.c 2007-08-04 17:54:15.000000000 +0800
+@@ -21,6 +21,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "stream.h"
+ #include "url.h"
+diff -urN -x .git mplayer.orig/stream/stream_rtsp.c mplayer-20070622/stream/stream_rtsp.c
+--- mplayer.orig/stream/stream_rtsp.c 2006-10-31 05:55:58.000000000 +0800
++++ mplayer-20070622/stream/stream_rtsp.c 2007-08-04 17:54:15.000000000 +0800
+@@ -19,6 +19,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+diff -urN -x .git mplayer.orig/stream/stream_tv.c mplayer-20070622/stream/stream_tv.c
+--- mplayer.orig/stream/stream_tv.c 2006-08-05 01:01:29.000000000 +0800
++++ mplayer-20070622/stream/stream_tv.c 2007-08-04 17:54:15.000000000 +0800
+@@ -21,6 +21,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "stream.h"
+ #include "libmpdemux/demuxer.h"
+diff -urN -x .git mplayer.orig/stream/stream_udp.c mplayer-20070622/stream/stream_udp.c
+--- mplayer.orig/stream/stream_udp.c 2006-08-05 03:31:53.000000000 +0800
++++ mplayer-20070622/stream/stream_udp.c 2007-08-04 17:54:15.000000000 +0800
+@@ -21,6 +21,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "stream.h"
+ #include "url.h"
+diff -urN -x .git mplayer.orig/stream/tcp.c mplayer-20070622/stream/tcp.c
+--- mplayer.orig/stream/tcp.c 2007-03-01 22:57:44.000000000 +0800
++++ mplayer-20070622/stream/tcp.c 2007-08-04 17:54:15.000000000 +0800
+@@ -6,6 +6,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+
+ #include <errno.h>
+diff -urN -x .git mplayer.orig/stream/tv.c mplayer-20070622/stream/tv.c
+--- mplayer.orig/stream/tv.c 2007-06-21 16:18:51.000000000 +0800
++++ mplayer-20070622/stream/tv.c 2007-08-04 17:54:15.000000000 +0800
+@@ -14,6 +14,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <ctype.h>
+ #include <sys/time.h>
+
+diff -urN -x .git mplayer.orig/stream/tvi_bsdbt848.c mplayer-20070622/stream/tvi_bsdbt848.c
+--- mplayer.orig/stream/tvi_bsdbt848.c 2007-05-20 19:36:50.000000000 +0800
++++ mplayer-20070622/stream/tvi_bsdbt848.c 2007-08-04 17:54:15.000000000 +0800
+@@ -36,6 +36,7 @@
+ #include <sys/time.h>
+ #include <signal.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include <sys/param.h>
+ #ifdef USE_SUN_AUDIO
+diff -urN -x .git mplayer.orig/stream/tvi_def.h mplayer-20070622/stream/tvi_def.h
+--- mplayer.orig/stream/tvi_def.h 2007-06-02 01:29:35.000000000 +0800
++++ mplayer-20070622/stream/tvi_def.h 2007-08-04 17:54:15.000000000 +0800
+@@ -1,5 +1,6 @@
+ #include <stdlib.h> /* malloc */
+ #include <string.h> /* memset */
++#include "libvo/fastmemset.h"
+
+ static int init(priv_t *priv);
+ static int uninit(priv_t *priv);
+diff -urN -x .git mplayer.orig/stream/tvi_v4l2.c mplayer-20070622/stream/tvi_v4l2.c
+--- mplayer.orig/stream/tvi_v4l2.c 2007-06-02 01:29:35.000000000 +0800
++++ mplayer-20070622/stream/tvi_v4l2.c 2007-08-04 17:54:15.000000000 +0800
+@@ -30,6 +30,7 @@
+ #include <pthread.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+ #include <sys/time.h>
+diff -urN -x .git mplayer.orig/stream/tvi_v4l.c mplayer-20070622/stream/tvi_v4l.c
+--- mplayer.orig/stream/tvi_v4l.c 2007-06-05 22:27:54.000000000 +0800
++++ mplayer-20070622/stream/tvi_v4l.c 2007-08-04 17:54:15.000000000 +0800
+@@ -33,6 +33,7 @@
+ #include <sys/mman.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <pthread.h>
+ #ifdef HAVE_SYS_SYSINFO_H
+ #include <sys/sysinfo.h>
+diff -urN -x .git mplayer.orig/stream/udp.c mplayer-20070622/stream/udp.c
+--- mplayer.orig/stream/udp.c 2007-03-09 04:47:10.000000000 +0800
++++ mplayer-20070622/stream/udp.c 2007-08-04 17:54:16.000000000 +0800
+@@ -21,6 +21,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <errno.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+diff -urN -x .git mplayer.orig/stream/url.c mplayer-20070622/stream/url.c
+--- mplayer.orig/stream/url.c 2007-08-04 14:58:31.000000000 +0800
++++ mplayer-20070622/stream/url.c 2007-08-04 17:54:16.000000000 +0800
+@@ -6,6 +6,7 @@
+ */
+
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <ctype.h>
+@@ -43,6 +44,208 @@
return res;
}
@@ -6171,7 +9005,7 @@ diff -urN mplayer-20070622.orig/stream/url.c mplayer-20070622/stream/url.c
URL_t*
url_new(const char* url) {
int pos1, pos2,v6addr = 0;
-@@ -57,11 +259,13 @@
+@@ -57,11 +260,13 @@
mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed);
goto err_out;
}
@@ -6185,7 +9019,7 @@ diff -urN mplayer-20070622.orig/stream/url.c mplayer-20070622/stream/url.c
// Create the URL container
Curl = malloc(sizeof(URL_t));
-@@ -73,7 +277,9 @@
+@@ -73,7 +278,9 @@
// Initialisation of the URL container members
memset( Curl, 0, sizeof(URL_t) );
@@ -6196,14 +9030,253 @@ diff -urN mplayer-20070622.orig/stream/url.c mplayer-20070622/stream/url.c
// Copy the url in the URL container
Curl->url = strdup(escfilename);
-@@ -395,3 +601,4 @@
+@@ -395,3 +602,4 @@
}
}
#endif //__URL_DEBUG
+
-diff -urN mplayer-20070622.orig/vidix/dha.h mplayer-20070622/vidix/dha.h
---- mplayer-20070622.orig/vidix/dha.h 2007-04-22 22:05:41.000000000 +0800
-+++ mplayer-20070622/vidix/dha.h 2007-08-04 07:35:34.000000000 +0800
+diff -urN -x .git mplayer.orig/sub_cc.c mplayer-20070622/sub_cc.c
+--- mplayer.orig/sub_cc.c 2006-11-26 06:18:40.000000000 +0800
++++ mplayer-20070622/sub_cc.c 2007-08-04 17:48:53.000000000 +0800
+@@ -16,6 +16,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "config.h"
+ #include "sub_cc.h"
+diff -urN -x .git mplayer.orig/subopt-helper.c mplayer-20070622/subopt-helper.c
+--- mplayer.orig/subopt-helper.c 2007-02-21 18:05:46.000000000 +0800
++++ mplayer-20070622/subopt-helper.c 2007-08-04 17:48:53.000000000 +0800
+@@ -22,6 +22,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <limits.h>
+ #include <assert.h>
+
+diff -urN -x .git mplayer.orig/subreader.c mplayer-20070622/subreader.c
+--- mplayer.orig/subreader.c 2007-06-02 21:00:38.000000000 +0800
++++ mplayer-20070622/subreader.c 2007-08-04 17:48:53.000000000 +0800
+@@ -10,6 +10,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <ctype.h>
+
+ #include <sys/types.h>
+diff -urN -x .git mplayer.orig/TOOLS/avi-fix.c mplayer-20070622/TOOLS/avi-fix.c
+--- mplayer.orig/TOOLS/avi-fix.c 2005-11-19 00:16:33.000000000 +0800
++++ mplayer-20070622/TOOLS/avi-fix.c 2007-08-04 17:54:17.000000000 +0800
+@@ -12,6 +12,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ //#include <string.h>
++#include "libvo/fastmemset.h"
+
+ #define FCC(a,b,c,d) (((a)<<24)|((b)<<16)|((c)<<8)|(d))
+
+diff -urN -x .git mplayer.orig/TOOLS/avisubdump.c mplayer-20070622/TOOLS/avisubdump.c
+--- mplayer.orig/TOOLS/avisubdump.c 2005-07-03 03:35:15.000000000 +0800
++++ mplayer-20070622/TOOLS/avisubdump.c 2007-08-04 17:54:17.000000000 +0800
+@@ -13,6 +13,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <fcntl.h>
+ #include <errno.h>
+
+diff -urN -x .git mplayer.orig/TOOLS/bmovl-test.c mplayer-20070622/TOOLS/bmovl-test.c
+--- mplayer.orig/TOOLS/bmovl-test.c 2007-03-20 09:20:57.000000000 +0800
++++ mplayer-20070622/TOOLS/bmovl-test.c 2007-08-04 17:54:17.000000000 +0800
+@@ -3,6 +3,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <stdlib.h>
+ #include <SDL/SDL.h>
+ #include <SDL/SDL_image.h>
+diff -urN -x .git mplayer.orig/TOOLS/fastmemcpybench.c mplayer-20070622/TOOLS/fastmemcpybench.c
+--- mplayer.orig/TOOLS/fastmemcpybench.c 2005-11-19 00:16:33.000000000 +0800
++++ mplayer-20070622/TOOLS/fastmemcpybench.c 2007-08-04 17:54:17.000000000 +0800
+@@ -10,6 +10,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <sys/ioctl.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+diff -urN -x .git mplayer.orig/TOOLS/vivodump.c mplayer-20070622/TOOLS/vivodump.c
+--- mplayer.orig/TOOLS/vivodump.c 2007-03-17 06:47:23.000000000 +0800
++++ mplayer-20070622/TOOLS/vivodump.c 2007-08-04 17:54:18.000000000 +0800
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+
+ #include "loader/wine/mmreg.h"
+diff -urN -x .git mplayer.orig/tremor/bitwise.c mplayer-20070622/tremor/bitwise.c
+--- mplayer.orig/tremor/bitwise.c 2005-04-24 16:37:48.000000000 +0800
++++ mplayer-20070622/tremor/bitwise.c 2007-08-04 17:54:18.000000000 +0800
+@@ -19,6 +19,7 @@
+ then we'll read the lsb first */
+
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <stdlib.h>
+ #include "ogg.h"
+
+diff -urN -x .git mplayer.orig/tremor/block.c mplayer-20070622/tremor/block.c
+--- mplayer.orig/tremor/block.c 2006-07-30 09:41:58.000000000 +0800
++++ mplayer-20070622/tremor/block.c 2007-08-04 17:54:18.000000000 +0800
+@@ -18,6 +18,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include "ogg.h"
+ #include "ivorbiscodec.h"
+ #include "codec_internal.h"
+diff -urN -x .git mplayer.orig/tremor/codebook.c mplayer-20070622/tremor/codebook.c
+--- mplayer.orig/tremor/codebook.c 2006-07-30 09:41:58.000000000 +0800
++++ mplayer-20070622/tremor/codebook.c 2007-08-04 17:54:18.000000000 +0800
+@@ -17,6 +17,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <math.h>
+ #include "ogg.h"
+ #include "ivorbiscodec.h"
+diff -urN -x .git mplayer.orig/tremor/floor0.c mplayer-20070622/tremor/floor0.c
+--- mplayer.orig/tremor/floor0.c 2004-12-30 20:11:32.000000000 +0800
++++ mplayer-20070622/tremor/floor0.c 2007-08-04 17:54:18.000000000 +0800
+@@ -17,6 +17,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <math.h>
+ #include "ogg.h"
+ #include "ivorbiscodec.h"
+diff -urN -x .git mplayer.orig/tremor/floor1.c mplayer-20070622/tremor/floor1.c
+--- mplayer.orig/tremor/floor1.c 2004-12-30 20:11:32.000000000 +0800
++++ mplayer-20070622/tremor/floor1.c 2007-08-04 17:54:18.000000000 +0800
+@@ -17,6 +17,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <math.h>
+ #include "ogg.h"
+ #include "ivorbiscodec.h"
+diff -urN -x .git mplayer.orig/tremor/framing.c mplayer-20070622/tremor/framing.c
+--- mplayer.orig/tremor/framing.c 2006-06-07 08:15:28.000000000 +0800
++++ mplayer-20070622/tremor/framing.c 2007-08-04 17:54:18.000000000 +0800
+@@ -22,6 +22,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include "ogg.h"
+
+ /* A complete description of Ogg framing exists in docs/framing.html */
+diff -urN -x .git mplayer.orig/tremor/info.c mplayer-20070622/tremor/info.c
+--- mplayer.orig/tremor/info.c 2006-07-30 09:41:58.000000000 +0800
++++ mplayer-20070622/tremor/info.c 2007-08-04 17:54:18.000000000 +0800
+@@ -20,6 +20,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <ctype.h>
+ #include "ogg.h"
+ #include "ivorbiscodec.h"
+diff -urN -x .git mplayer.orig/tremor/mapping0.c mplayer-20070622/tremor/mapping0.c
+--- mplayer.orig/tremor/mapping0.c 2006-07-30 09:41:58.000000000 +0800
++++ mplayer-20070622/tremor/mapping0.c 2007-08-04 17:54:18.000000000 +0800
+@@ -18,6 +18,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <math.h>
+ #include "ogg.h"
+ #include "ivorbiscodec.h"
+diff -urN -x .git mplayer.orig/tremor/res012.c mplayer-20070622/tremor/res012.c
+--- mplayer.orig/tremor/res012.c 2006-07-30 09:41:58.000000000 +0800
++++ mplayer-20070622/tremor/res012.c 2007-08-04 17:54:18.000000000 +0800
+@@ -17,6 +17,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <math.h>
+ #include "ogg.h"
+ #include "ivorbiscodec.h"
+diff -urN -x .git mplayer.orig/tremor/sharedbook.c mplayer-20070622/tremor/sharedbook.c
+--- mplayer.orig/tremor/sharedbook.c 2006-07-30 18:56:35.000000000 +0800
++++ mplayer-20070622/tremor/sharedbook.c 2007-08-04 17:54:18.000000000 +0800
+@@ -18,6 +18,7 @@
+ #include <stdlib.h>
+ #include <math.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include "ogg.h"
+ #include "os.h"
+ #include "misc.h"
+diff -urN -x .git mplayer.orig/unrarlib.c mplayer-20070622/unrarlib.c
+--- mplayer.orig/unrarlib.c 2006-06-22 21:34:00.000000000 +0800
++++ mplayer-20070622/unrarlib.c 2007-08-04 17:48:54.000000000 +0800
+@@ -75,6 +75,7 @@
+ #include <windows.h> /* WIN32 definitions */
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+
+ #define ENABLE_ACCESS
+@@ -108,6 +109,7 @@
+ #include <stdlib.h>
+ #include <ctype.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #define ENABLE_ACCESS
+
+diff -urN -x .git mplayer.orig/vidix/cyberblade_vid.c mplayer-20070622/vidix/cyberblade_vid.c
+--- mplayer.orig/vidix/cyberblade_vid.c 2007-05-01 06:14:29.000000000 +0800
++++ mplayer-20070622/vidix/cyberblade_vid.c 2007-08-04 17:54:19.000000000 +0800
+@@ -40,6 +40,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <unistd.h>
+
+diff -urN -x .git mplayer.orig/vidix/dha.c mplayer-20070622/vidix/dha.c
+--- mplayer.orig/vidix/dha.c 2007-04-23 03:02:05.000000000 +0800
++++ mplayer-20070622/vidix/dha.c 2007-08-04 17:54:19.000000000 +0800
+@@ -40,6 +40,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <fcntl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+diff -urN -x .git mplayer.orig/vidix/dha.h mplayer-20070622/vidix/dha.h
+--- mplayer.orig/vidix/dha.h 2007-08-04 14:58:31.000000000 +0800
++++ mplayer-20070622/vidix/dha.h 2007-08-04 17:54:19.000000000 +0800
@@ -41,9 +41,6 @@
#endif
@@ -6225,9 +9298,42 @@ diff -urN mplayer-20070622.orig/vidix/dha.h mplayer-20070622/vidix/dha.h
extern int pci_scan(pciinfo_t *pci_list,unsigned *num_card);
-diff -urN mplayer-20070622.orig/vidix/Makefile mplayer-20070622/vidix/Makefile
---- mplayer-20070622.orig/vidix/Makefile 2007-05-18 05:48:56.000000000 +0800
-+++ mplayer-20070622/vidix/Makefile 2007-08-04 07:37:11.000000000 +0800
+diff -urN -x .git mplayer.orig/vidix/drivers.c mplayer-20070622/vidix/drivers.c
+--- mplayer.orig/vidix/drivers.c 2007-05-11 02:47:27.000000000 +0800
++++ mplayer-20070622/vidix/drivers.c 2007-08-04 17:54:19.000000000 +0800
+@@ -23,6 +23,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "vidixlib.h"
+ #include "config.h"
+diff -urN -x .git mplayer.orig/vidix/ivtv_vid.c mplayer-20070622/vidix/ivtv_vid.c
+--- mplayer.orig/vidix/ivtv_vid.c 2007-05-11 02:47:27.000000000 +0800
++++ mplayer-20070622/vidix/ivtv_vid.c 2007-08-04 17:54:19.000000000 +0800
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <unistd.h>
+ #include <math.h>
+ #include <inttypes.h>
+diff -urN -x .git mplayer.orig/vidix/mach64_vid.c mplayer-20070622/vidix/mach64_vid.c
+--- mplayer.orig/vidix/mach64_vid.c 2007-05-01 06:14:29.000000000 +0800
++++ mplayer-20070622/vidix/mach64_vid.c 2007-08-04 17:54:19.000000000 +0800
+@@ -26,6 +26,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <math.h>
+ #include <inttypes.h>
+ #include <fcntl.h>
+diff -urN -x .git mplayer.orig/vidix/Makefile mplayer-20070622/vidix/Makefile
+--- mplayer.orig/vidix/Makefile 2007-08-04 14:58:31.000000000 +0800
++++ mplayer-20070622/vidix/Makefile 2007-08-04 16:45:16.000000000 +0800
@@ -4,9 +4,7 @@
SRCS_MPLAYER = vidixlib.c \
@@ -6239,9 +9345,20 @@ diff -urN mplayer-20070622.orig/vidix/Makefile mplayer-20070622/vidix/Makefile
pci_names.c \
pci_dev_ids.c\
-diff -urN mplayer-20070622.orig/vidix/mips_dha.c mplayer-20070622/vidix/mips_dha.c
---- mplayer-20070622.orig/vidix/mips_dha.c 1970-01-01 08:00:00.000000000 +0800
-+++ mplayer-20070622/vidix/mips_dha.c 2007-08-04 07:39:59.000000000 +0800
+diff -urN -x .git mplayer.orig/vidix/mga_vid.c mplayer-20070622/vidix/mga_vid.c
+--- mplayer.orig/vidix/mga_vid.c 2007-05-01 06:14:29.000000000 +0800
++++ mplayer-20070622/vidix/mga_vid.c 2007-08-04 17:54:19.000000000 +0800
+@@ -50,6 +50,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <math.h>
+ #include <inttypes.h>
+
+diff -urN -x .git mplayer.orig/vidix/mips_dha.c mplayer-20070622/vidix/mips_dha.c
+--- mplayer.orig/vidix/mips_dha.c 1970-01-01 08:00:00.000000000 +0800
++++ mplayer-20070622/vidix/mips_dha.c 2007-08-04 17:54:19.000000000 +0800
@@ -0,0 +1,328 @@
+#include <sys/types.h>
+#include <sys/stat.h>
@@ -6571,3 +9688,135 @@ diff -urN mplayer-20070622.orig/vidix/mips_dha.c mplayer-20070622/vidix/mips_dha
+
+ return 0;
+}
+diff -urN -x .git mplayer.orig/vidix/mtrr.c mplayer-20070622/vidix/mtrr.c
+--- mplayer.orig/vidix/mtrr.c 2007-04-22 22:05:41.000000000 +0800
++++ mplayer-20070622/vidix/mtrr.c 2007-08-04 17:54:19.000000000 +0800
+@@ -24,6 +24,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <errno.h>
+ #include "dha.h"
+ #include "AsmMacros.h"
+diff -urN -x .git mplayer.orig/vidix/nvidia_vid.c mplayer-20070622/vidix/nvidia_vid.c
+--- mplayer.orig/vidix/nvidia_vid.c 2007-04-22 23:44:42.000000000 +0800
++++ mplayer-20070622/vidix/nvidia_vid.c 2007-08-04 17:54:20.000000000 +0800
+@@ -26,6 +26,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <math.h>
+ #include <inttypes.h>
+ #include <unistd.h>
+diff -urN -x .git mplayer.orig/vidix/pci.c mplayer-20070622/vidix/pci.c
+--- mplayer.orig/vidix/pci.c 2007-04-22 23:18:48.000000000 +0800
++++ mplayer-20070622/vidix/pci.c 2007-08-04 17:54:20.000000000 +0800
+@@ -54,6 +54,7 @@
+ #include "dha.h"
+ #include <errno.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <stdio.h>
+ #ifdef __unix__
+ #include <unistd.h>
+diff -urN -x .git mplayer.orig/vidix/pm2_vid.c mplayer-20070622/vidix/pm2_vid.c
+--- mplayer.orig/vidix/pm2_vid.c 2007-04-22 23:44:42.000000000 +0800
++++ mplayer-20070622/vidix/pm2_vid.c 2007-08-04 17:54:20.000000000 +0800
+@@ -23,6 +23,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+diff -urN -x .git mplayer.orig/vidix/pm3_vid.c mplayer-20070622/vidix/pm3_vid.c
+--- mplayer.orig/vidix/pm3_vid.c 2007-05-01 06:14:29.000000000 +0800
++++ mplayer-20070622/vidix/pm3_vid.c 2007-08-04 17:54:20.000000000 +0800
+@@ -23,6 +23,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <unistd.h>
+
+diff -urN -x .git mplayer.orig/vidix/radeon_vid.c mplayer-20070622/vidix/radeon_vid.c
+--- mplayer.orig/vidix/radeon_vid.c 2007-05-01 06:14:29.000000000 +0800
++++ mplayer-20070622/vidix/radeon_vid.c 2007-08-04 17:54:20.000000000 +0800
+@@ -33,6 +33,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <math.h>
+ #include <inttypes.h>
+
+diff -urN -x .git mplayer.orig/vidix/savage_vid.c mplayer-20070622/vidix/savage_vid.c
+--- mplayer.orig/vidix/savage_vid.c 2007-04-22 23:44:42.000000000 +0800
++++ mplayer-20070622/vidix/savage_vid.c 2007-08-04 17:54:20.000000000 +0800
+@@ -25,6 +25,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <unistd.h>
+ #include <math.h>
+diff -urN -x .git mplayer.orig/vidix/sis_vid.c mplayer-20070622/vidix/sis_vid.c
+--- mplayer.orig/vidix/sis_vid.c 2007-05-10 01:16:59.000000000 +0800
++++ mplayer-20070622/vidix/sis_vid.c 2007-08-04 17:54:21.000000000 +0800
+@@ -27,6 +27,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <unistd.h>
+
+diff -urN -x .git mplayer.orig/vidix/unichrome_vid.c mplayer-20070622/vidix/unichrome_vid.c
+--- mplayer.orig/vidix/unichrome_vid.c 2007-04-22 23:44:42.000000000 +0800
++++ mplayer-20070622/vidix/unichrome_vid.c 2007-08-04 17:54:21.000000000 +0800
+@@ -33,6 +33,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <inttypes.h>
+ #include <unistd.h>
+
+diff -urN -x .git mplayer.orig/vidix/vidixlib.c mplayer-20070622/vidix/vidixlib.c
+--- mplayer.orig/vidix/vidixlib.c 2007-04-22 22:05:41.000000000 +0800
++++ mplayer-20070622/vidix/vidixlib.c 2007-08-04 17:54:21.000000000 +0800
+@@ -36,6 +36,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+
+ #include "vidixlib.h"
+ #include "drivers.h"
+diff -urN -x .git mplayer.orig/vobsub.c mplayer-20070622/vobsub.c
+--- mplayer.orig/vobsub.c 2007-03-01 20:54:08.000000000 +0800
++++ mplayer-20070622/vobsub.c 2007-08-04 17:48:54.000000000 +0800
+@@ -9,6 +9,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+diff -urN -x .git mplayer.orig/xvid_vbr.c mplayer-20070622/xvid_vbr.c
+--- mplayer.orig/xvid_vbr.c 2007-05-17 05:50:59.000000000 +0800
++++ mplayer-20070622/xvid_vbr.c 2007-08-04 17:48:54.000000000 +0800
+@@ -26,6 +26,7 @@
+ /* Standard Headers */
+ #include <stdio.h>
+ #include <string.h>
++#include "libvo/fastmemset.h"
+ #include <fcntl.h>
+ #include <stdlib.h>
+ #include <math.h>