Merge of several revisions that add more targets to the

Makefile.

Commited in SoC by Bobby Bingham on sep. 2007.

Originally committed as revision 11947 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index d3f1931..a4cb303 100644 (file)
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -4,15 +4,20 @@ CFLAGS+=-I$(SRC_PATH)/libavcodec
 
 OBJS = avfilter.o \
        avfiltergraph.o \
+       avfiltergraphdesc.o \
+       defaults.o \
 
 # TODO: real conditional compilation
 OBJS-yes = vsrc_dummy.o \
            vsrc_ppm.o \
            vo_sdl.o \
            vf_crop.o \
+           vf_fps.o \
+           vf_overlay.o \
            vf_passthrough.o \
            vf_rgb2bgr.o \
            vf_slicify.o \
+           vf_vflip.o \
 
 HEADERS = avfilter.h