diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-30 14:00:32 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-30 14:00:32 +0000 |
| commit | b5ea65c04f7062e7f265f3b9b9327cf6ae81df60 (patch) | |
| tree | fd685828b322104ad4878f3ba4416d986ef320d6 | |
| parent | d9c022848862697225f7698db802f1efa64d66db (diff) | |
| download | mpv-b5ea65c04f7062e7f265f3b9b9327cf6ae81df60.tar.bz2 mpv-b5ea65c04f7062e7f265f3b9b9327cf6ae81df60.tar.xz | |
Remove unused fast_memcpy() function and link against the object that
contains fast_memcpy() instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26610 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | TOOLS/subrip.c | 6 |
2 files changed, 2 insertions, 7 deletions
@@ -929,7 +929,8 @@ TOOLS_COMMON_LIBS = mp_msg-mencoder.o mp_fifo.o osdep/$(TIMER) osdep/$(GETCH) \ TOOLS/bmovl-test$(EXESUF): TOOLS/bmovl-test.c -lSDL_image TOOLS/subrip$(EXESUF): TOOLS/subrip.c vobsub.o spudec.o unrar_exec.o \ - libswscale/libswscale.a libavutil/libavutil.a $(TOOLS_COMMON_LIBS) + libvo/aclib.o libswscale/libswscale.a libavutil/libavutil.a \ + $(TOOLS_COMMON_LIBS) TOOLS/vfw2menc$(EXESUF): TOOLS/vfw2menc.c -lwinmm -lole32 diff --git a/TOOLS/subrip.c b/TOOLS/subrip.c index 65d607fc4e..2c783394a5 100644 --- a/TOOLS/subrip.c +++ b/TOOLS/subrip.c @@ -187,12 +187,6 @@ draw_alpha(int x0, int y0, int w, int h, unsigned char *src, unsigned char *srca unlink(tmpfname); } -static void -fast_memcpy(void *a, void *b, int s) -{ //FIXME - memcpy(a, b, s); -} - int main(int argc, char **argv) { |