virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-06 08:29:25 +02:00
Code Issues Releases Activity

added QT faststart remuxing utility to ffmpeg distribution per, ahem,

Browse Source 
popular request

Originally committed as revision 2934 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Mike Melanson
2004-03-26 20:42:28 +00:00
parent 042e3bfe9d
commit 38100e8c8d
2 changed files with 269 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -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 $@ $<