Mercurial > mplayer.hg

changeset 26578:7a7a294e07e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove unused fast_memcpy() function and link against the object that contains fast_memcpy() instead.
author diego
date Wed, 30 Apr 2008 14:00:32 +0000
parents d1e4656332cf
children 647abf37a825
files Makefile TOOLS/subrip.c
diffstat 2 files changed, 2 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Wed Apr 30 13:58:26 2008 +0000
+++ b/Makefile	Wed Apr 30 14:00:32 2008 +0000
@@ -929,7 +929,8 @@
 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
 
--- a/TOOLS/subrip.c	Wed Apr 30 13:58:26 2008 +0000
+++ b/TOOLS/subrip.c	Wed Apr 30 14:00:32 2008 +0000
@@ -187,12 +187,6 @@
     unlink(tmpfname);
 }
 
-static void
-fast_memcpy(void *a, void *b, int s)
-{ //FIXME
-    memcpy(a, b, s);
-}
-
 int
 main(int argc, char **argv)
 {