# HG changeset patch # User reimar # Date 1168688676 0 # Node ID d885d65e8dc85ffe5b49172dded01f8539cae431 # Parent 7484e767c53df02cbd3e18e4788bf93eb335aa19 Simplify gif demuxer by using memcpy_pic diff -r 7484e767c53d -r d885d65e8dc8 libmpdemux/demux_gif.c --- a/libmpdemux/demux_gif.c Sat Jan 13 11:40:05 2007 +0000 +++ b/libmpdemux/demux_gif.c Sat Jan 13 11:44:36 2007 +0000 @@ -17,6 +17,7 @@ #include "stheader.h" #include +#include "libvo/fastmemcpy.h" typedef struct { int current_pts; unsigned char *palette; @@ -125,6 +126,7 @@ int t = FFMAX(FFMIN(gif->Image.Top, priv->h), 0); int w = FFMAX(FFMIN(gif->Image.Width, priv->w - l), 0); int h = FFMAX(FFMIN(gif->Image.Height, priv->h - t), 0); + unsigned char *dest = dp->buffer + priv->w * t + l; // copy the palette for (y = 0; y < cnt; y++) { @@ -134,14 +136,7 @@ priv->palette[(y * 4) + 3] = 0; } - for (y = 0; y < h; y++) { - unsigned char *drow = dp->buffer; - unsigned char *gbuf = buf + (y * gif->Image.Width); - - drow += priv->w * (y + t) + l; - - memcpy(drow, gbuf, w); - } + memcpy_pic(dest, buf, w, h, priv->w, gif->Image.Width); } free(buf);