diff options
| author | wm4 <wm4@nowhere> | 2012-11-09 01:31:49 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-11-11 17:56:42 +0100 |
| commit | eb6688724ceb0e222ccc9f1de6640bfabdd67a43 (patch) | |
| tree | 99dcbb85b09157415d0aa0fc9d2deb5c6bd90b36 /libao2/ao_dsound.c | |
| parent | 34649dbd1da2ce07a6e952bec10f52dfae5a257d (diff) | |
| download | mpv-eb6688724ceb0e222ccc9f1de6640bfabdd67a43.tar.bz2 mpv-eb6688724ceb0e222ccc9f1de6640bfabdd67a43.tar.xz | |
Replace fast_memcpy() uses
fast_memcpy, defined in fastmemcpy.h, used to be mplayer's "optimized"
memcpy. It has been removed from this fork, and fast_memcpy has been
reduced to an alias for memcpy. Replace all remaining uses of the
fast_memcpy macro alias.
Diffstat (limited to 'libao2/ao_dsound.c')
| -rw-r--r-- | libao2/ao_dsound.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libao2/ao_dsound.c b/libao2/ao_dsound.c index 4ef7029c29..f2f44dd401 100644 --- a/libao2/ao_dsound.c +++ b/libao2/ao_dsound.c @@ -37,7 +37,6 @@ #include "audio_out.h" #include "audio_out_internal.h" #include "mp_msg.h" -#include "libvo/fastmemcpy.h" #include "osdep/timer.h" #include "subopt-helper.h" @@ -358,8 +357,8 @@ static int write_buffer(unsigned char *data, int len) if(write_offset>=buffer_size)write_offset=dwBytes2; } else { // Write to pointers without reordering. - fast_memcpy(lpvPtr1,data,dwBytes1); - if (NULL != lpvPtr2 )fast_memcpy(lpvPtr2,data+dwBytes1,dwBytes2); + memcpy(lpvPtr1,data,dwBytes1); + if (NULL != lpvPtr2 )memcpy(lpvPtr2,data+dwBytes1,dwBytes2); write_offset+=dwBytes1+dwBytes2; if(write_offset>=buffer_size)write_offset=dwBytes2; } |