Remove unused fast_memcpy() function and link against the object that
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Wed, 30 Apr 2008 14:00:32 +0000 (14:00 +0000)
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Wed, 30 Apr 2008 14:00:32 +0000 (14:00 +0000)
contains fast_memcpy() instead.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@26610 b3059339-0415-0410-9bf9-f77b7e298cf2

Makefile
TOOLS/subrip.c

index aa46374..32dd0d8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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
 
index 65d607f..2c78339 100644 (file)
@@ -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)
 {