suppress PTS in packets when not needed (slightly smaller files), fixed PTS generatio...

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 32e7919fadffebf8b394983c590338269bab4559..d5a9d376e0f279a1d9cbebffd7f9e3402e0272e1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ include config.mak
 
 VPATH=$(SRC_PATH)
 
-CFLAGS= $(OPTFLAGS) -Wall -g -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
 LDFLAGS+= -g 
 
 ifeq ($(TARGET_GPROF),yes)
@@ -14,20 +14,15 @@ CFLAGS+=-p
 LDFLAGS+=-p
 endif
 
-ifeq ($(CONFIG_WIN32),yes)
-EXE=.exe
-PROG=ffmpeg$(EXE)
-else
-ifeq ($(CONFIG_OS2),yes)
-EXE=.exe
-PROG=ffmpeg$(EXE)
-else
-EXE=
-PROG=ffmpeg ffplay
+PROG=ffmpeg$(EXESUF)
+PROGTEST=output_example$(EXESUF)
+
 ifeq ($(CONFIG_FFSERVER),yes)
-PROG+=ffserver
-endif
+PROG+=ffserver$(EXESUF)
 endif
+
+ifeq ($(CONFIG_FFPLAY),yes)
+PROG+=ffplay$(EXESUF)
 endif
 
 ifeq ($(CONFIG_AUDIO_BEOS),yes)
@@ -35,7 +30,7 @@ EXTRALIBS+=-lmedia -lbe
 endif
 
 ifeq ($(BUILD_SHARED),yes)
-DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
+DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF)
 else
 DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
 ifeq ($(CONFIG_MP3LAME),yes)
@@ -47,34 +42,62 @@ ifeq ($(CONFIG_VORBIS),yes)
 EXTRALIBS+=-logg -lvorbis -lvorbisenc
 endif
 
+ifeq ($(CONFIG_FAAD),yes)
+ifeq ($(CONFIG_FAADBIN),yes)
+# no libs needed
+else
+EXTRALIBS += -lfaad
+endif
+endif
+
+ifeq ($(CONFIG_FAAC),yes)
+EXTRALIBS+=-lfaac
+endif
+
 ifeq ($(BUILD_VHOOK),yes)
 VHOOK=videohook
 INSTALLVHOOK=install-vhook
 CLEANVHOOK=clean-vhook
 endif
 
-OBJS = ffmpeg.o ffserver.o
+ifeq ($(TARGET_OS), SunOS)
+TEST=/usr/bin/test
+else
+TEST=test
+endif
+
+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) $(VHOOK)
+all: lib $(PROG) $(PROGTEST) $(VHOOK)
 
 lib:
        $(MAKE) -C libavcodec all
        $(MAKE) -C libavformat all
 
-ffmpeg_g$(EXE): ffmpeg.o .libs
-       $(CC) $(LDFLAGS) -o $@ ffmpeg.o $(FFLIBS) $(EXTRALIBS)
+ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
+       $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
 
-ffmpeg$(EXE): ffmpeg_g$(EXE)
+ffmpeg$(EXESUF): ffmpeg_g$(EXESUF)
        cp -p $< $@
        $(STRIP) $@
 
-ffserver$(EXE): ffserver.o .libs
+ffserver$(EXESUF): ffserver.o .libs
        $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS) 
 
-ffplay: ffmpeg$(EXE)
-       ln -sf $< $@
+ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
+       $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
+
+ffplay$(EXESUF): ffplay_g$(EXESUF)
+       cp -p $< $@
+       $(STRIP) $@
+
+output_example$(EXESUF): output_example.o .libs
+       $(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
+
+ffplay.o: ffplay.c
+       $(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@ $< 
 
 %.o: %.c
        $(CC) $(CFLAGS) -c -o $@ $< 
@@ -82,11 +105,27 @@ ffplay: ffmpeg$(EXE)
 videohook: .libs
        $(MAKE) -C vhook all
 
-install: all $(INSTALLVHOOK)
+.PHONY: install
+
+install: all install-man $(INSTALLVHOOK)
        $(MAKE) -C libavcodec install
-       install -d $(prefix)/bin
-       install -c -s -m 755 $(PROG) $(prefix)/bin
-       ln -sf ffmpeg $(prefix)/bin/ffplay 
+       $(MAKE) -C libavformat install
+       install -d "$(bindir)"
+       install -c -s -m 755 $(PROG) "$(bindir)"
+
+# create the window installer
+wininstaller: all install
+       makensis ffinstall.nsi
+
+# install man from source dir if available
+install-man:
+ifneq ($(CONFIG_WIN32),yes)
+       if [ -f $(SRC_PATH)/doc/ffmpeg.1 ] ; then \
+           install -d $(mandir)/man1 ; \
+           install -m 644 $(SRC_PATH)/doc/ffmpeg.1 $(SRC_PATH)/doc/ffplay.1 \
+                           $(SRC_PATH)/doc/ffserver.1 $(mandir)/man1 ; \
+       fi
+endif
 
 install-vhook: $(prefix)/lib/vhook
        $(MAKE) -C vhook install INSTDIR=$(prefix)/lib/vhook
@@ -112,13 +151,13 @@ endif
 
 .libs: lib
        @test -f .libs || touch .libs
-       @for i in $(DEP_LIBS) ; do if test $$i -nt .libs ; then touch .libs; fi ; done
+       @for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .libs ; then touch .libs; fi ; done
 
 clean: $(CLEANVHOOK)
        $(MAKE) -C libavcodec clean
        $(MAKE) -C libavformat clean
        $(MAKE) -C tests clean
-       rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXE) $(PROG) 
+       rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXESUF) ffplay_g$(EXESUF) $(PROG) $(PROGTEST)
 
 clean-vhook:
        $(MAKE) -C vhook clean
@@ -132,11 +171,12 @@ TAGS:
 
 # regression tests
 
-libavtest test mpeg4 mpeg: ffmpeg$(EXE)
+libavtest test mpeg4 mpeg test-server fulltest: ffmpeg$(EXESUF)
        $(MAKE) -C tests $@
 
 # tar release (use 'make -k tar' on a checkouted tree)
-FILE=ffmpeg-$(shell cat VERSION)
+FILE=ffmpeg-$(shell grep "\#define FFMPEG_VERSION " libavcodec/avcodec.h | \
+                    cut -d "\"" -f 2 )
 
 tar:
        rm -rf /tmp/$(FILE)