Merge of several revisions adding filters

Commited in SoC by Bobby Bingham from 2007-07-06 to
2007-07-08.

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

diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index b27b4f1..a7e558c 100644 (file)
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -3,10 +3,14 @@ CFLAGS = -g -I../libavcodec -I../libavutil
 LIBS = ../libavcodec/libavcodec.a ../libavutil/libavutil.a -lm -lSDL
 
 OBJECTS = avfilter.o          \
+          avfiltergraph.o     \
           vsrc_dummy.o        \
+                 vsrc_ppm.o          \
                  vo_sdl.o            \
                  vf_crop.o           \
                  vf_passthrough.o    \
+                 vf_rgb2bgr.o        \
+                 vf_slicify.o        \
 
 all: filter_test