[MPlayer-cvslog] r26610 - in trunk: Makefile TOOLS/subrip.c

[diego]

Author: diego
Date: Wed Apr 30 16:00:32 2008
New Revision: 26610

Log:
Remove unused fast_memcpy() function and link against the object that
contains fast_memcpy() instead.


Modified:
   trunk/Makefile
   trunk/TOOLS/subrip.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Wed Apr 30 16:00:32 2008
@@ -929,7 +929,8 @@ TOOLS_COMMON_LIBS = mp_msg-mencoder.o mp
 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
 

Modified: trunk/TOOLS/subrip.c
==============================================================================
--- trunk/TOOLS/subrip.c	(original)
+++ trunk/TOOLS/subrip.c	Wed Apr 30 16:00:32 2008
@@ -187,12 +187,6 @@ draw_alpha(int x0, int y0, int w, int h,
     unlink(tmpfname);
 }
 
-static void
-fast_memcpy(void *a, void *b, int s)
-{ //FIXME
-    memcpy(a, b, s);
-}
-
 int
 main(int argc, char **argv)
 {