summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rw-r--r--TOOLS/subrip.c6
2 files changed, 2 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index aa46374697..32dd0d8b52 100644
--- 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
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)
{