From 44c9efcb571ee4f1ea44f658a923cd8a5923f27f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= Date: Fri, 17 Apr 2009 17:20:48 +0000 Subject: [PATCH] Use memcpy instead of the very inefficient bytecopy where both are correct (i.e. no overlap of src and dst is possible). Originally committed as revision 18569 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/xan.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/xan.c b/libavcodec/xan.c index 65c65283b1..36e944fdb1 100644 --- a/libavcodec/xan.c +++ b/libavcodec/xan.c @@ -148,7 +148,7 @@ static void xan_unpack(unsigned char *dest, const unsigned char *src, int dest_l size = opcode & 3; if (dest + size > dest_end) return; - bytecopy(dest, src, size); dest += size; src += size; + memcpy(dest, src, size); dest += size; src += size; size = ((opcode & 0x1c) >> 2) + 3; if (dest + size > dest_end) @@ -164,7 +164,7 @@ static void xan_unpack(unsigned char *dest, const unsigned char *src, int dest_l size = byte1 >> 6; if (dest + size > dest_end) return; - bytecopy (dest, src, size); dest += size; src += size; + memcpy(dest, src, size); dest += size; src += size; size = (opcode & 0x3f) + 4; if (dest + size > dest_end) @@ -181,7 +181,7 @@ static void xan_unpack(unsigned char *dest, const unsigned char *src, int dest_l size = opcode & 3; if (dest + size > dest_end) return; - bytecopy (dest, src, size); dest += size; src += size; + memcpy(dest, src, size); dest += size; src += size; size = byte3 + 5 + ((opcode & 0xc) << 6); if (dest + size > dest_end) @@ -198,12 +198,12 @@ static void xan_unpack(unsigned char *dest, const unsigned char *src, int dest_l if (dest + size > dest_end) return; - bytecopy (dest, src, size); dest += size; src += size; + memcpy(dest, src, size); dest += size; src += size; } } size = opcode & 3; - bytecopy(dest, src, size); dest += size; src += size; + memcpy(dest, src, size); dest += size; src += size; } static inline void xan_wc3_output_pixel_run(XanContext *s,