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 /libmpdemux/demuxer.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 'libmpdemux/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 1119e61013..3673fd06e3 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -33,8 +33,6 @@ #include "mp_msg.h" #include "m_config.h" -#include "libvo/fastmemcpy.h" - #include "stream/stream.h" #include "demuxer.h" #include "stheader.h" @@ -701,7 +699,7 @@ int demux_read_data(demux_stream_t *ds, unsigned char *mem, int len) if (x > len) x = len; if (mem) - fast_memcpy(mem + bytes, &ds->buffer[ds->buffer_pos], x); + memcpy(mem + bytes, &ds->buffer[ds->buffer_pos], x); bytes += x; len -= x; ds->buffer_pos += x; |