diff options
| author | Mike Melanson <mike@multimedia.cx> | 2004-03-26 20:42:28 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2004-03-26 20:42:28 +0000 |
| commit | 38100e8c8d5c0b5c48cb9e00d298e1940d5ad89b (patch) | |
| tree | a4a038231127de09b6f5ba05d6513531a7f7fbfa /Makefile | |
| parent | 042e3bfe9d0755c7b5a010cc39c67312efa90d8c (diff) | |
| download | ffmpeg-38100e8c8d5c0b5c48cb9e00d298e1940d5ad89b.tar.gz | |
added QT faststart remuxing utility to ffmpeg distribution per, ahem,
popular request
Originally committed as revision 2934 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -1,6 +1,6 @@ # # Main ffmpeg Makefile -# (c) 2000, 2001, 2002 Fabrice Bellard +# (c) 2000-2004 Fabrice Bellard # include config.mak @@ -16,6 +16,7 @@ endif PROG=ffmpeg$(EXESUF) PROGTEST=output_example$(EXESUF) +QTFASTSTART=qt-faststart$(EXESUF) ifeq ($(CONFIG_FFSERVER),yes) PROG+=ffserver$(EXESUF) @@ -70,7 +71,7 @@ OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s) FFLIBS = -L./libavformat -lavformat -L./libavcodec -lavcodec -all: lib $(PROG) $(PROGTEST) $(VHOOK) +all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) lib: $(MAKE) -C libavcodec all @@ -96,6 +97,9 @@ ffplay$(EXESUF): ffplay_g$(EXESUF) output_example$(EXESUF): output_example.o .libs $(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS) +qt-faststart$(EXESUF): qt-faststart.c + $(CC) qt-faststart.c -o qt-faststart$(EXESUF) + ffplay.o: ffplay.c $(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@ $< |