[FFmpeg-soc] [soc]: r5863 - in libavfilter: Makefile allfilters.c diffs/01_build.diff
stefano
subversion at mplayerhq.hu
Sat Jul 17 22:24:32 CEST 2010
Author: stefano
Date: Sat Jul 17 22:24:32 2010
New Revision: 5863
Log:
Do not literally copy the allfilters.c and Makefile files anymore,
apply the patch 01_build.diff instead.
Simplify the integration work a bit.
Added:
libavfilter/diffs/01_build.diff
Deleted:
libavfilter/Makefile
libavfilter/allfilters.c
Added: libavfilter/diffs/01_build.diff
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ libavfilter/diffs/01_build.diff Sat Jul 17 22:24:32 2010 (r5863)
@@ -0,0 +1,88 @@
+Index: libavfilter/Makefile
+===================================================================
+--- libavfilter/Makefile (revision 24294)
++++ libavfilter/Makefile (working copy)
+@@ -1,10 +1,11 @@
+ include $(SUBDIR)../config.mak
+
+ NAME = avfilter
+-FFLIBS = avcodec avutil swscale
++FFLIBS = avcodec avutil
++FFLIBS-$(CONFIG_SCALE_FILTER) += swscale
+ FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat
+
+-HEADERS = avfilter.h
++HEADERS = avfilter.h avfiltergraph.h
+
+ OBJS = allfilters.o \
+ avfilter.o \
+@@ -16,19 +17,32 @@
+
+ OBJS-$(CONFIG_ASPECT_FILTER) += vf_aspect.o
+ OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o
++OBJS-$(CONFIG_DRAWBOX_FILTER) += vf_drawbox.o
++OBJS-$(CONFIG_DRAWTEXT_FILTER) += vf_drawtext.o
++OBJS-$(CONFIG_FADE_FILTER) += vf_fade.o
++OBJS-$(CONFIG_FIFO_FILTER) += vf_fifo.o
+ OBJS-$(CONFIG_FORMAT_FILTER) += vf_format.o
++OBJS-$(CONFIG_FPS_FILTER) += vf_fps.o
++OBJS-$(CONFIG_HFLIP_FILTER) += vf_hflip.o
++OBJS-$(CONFIG_NEGATE_FILTER) += vf_negate.o
+ OBJS-$(CONFIG_NOFORMAT_FILTER) += vf_format.o
+ OBJS-$(CONFIG_NULL_FILTER) += vf_null.o
++OBJS-$(CONFIG_OVERLAY_FILTER) += vf_overlay.o
+ OBJS-$(CONFIG_PAD_FILTER) += vf_pad.o
+ OBJS-$(CONFIG_PIXDESCTEST_FILTER) += vf_pixdesctest.o
+ OBJS-$(CONFIG_PIXELASPECT_FILTER) += vf_aspect.o
++OBJS-$(CONFIG_ROTATE_FILTER) += vf_rotate.o
+ OBJS-$(CONFIG_SCALE_FILTER) += vf_scale.o
++OBJS-$(CONFIG_SETPTS_FILTER) += vf_setpts.o
+ OBJS-$(CONFIG_SLICIFY_FILTER) += vf_slicify.o
++OBJS-$(CONFIG_SPLIT_FILTER) += vf_split.o
++OBJS-$(CONFIG_TRANSPOSE_FILTER) += vf_transpose.o
+ OBJS-$(CONFIG_UNSHARP_FILTER) += vf_unsharp.o
+ OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o
+
+ OBJS-$(CONFIG_BUFFER_FILTER) += vsrc_buffer.o
+ OBJS-$(CONFIG_COLOR_FILTER) += vf_pad.o
++OBJS-$(CONFIG_MOVIE_FILTER) += vsrc_movie.o
+ OBJS-$(CONFIG_NULLSRC_FILTER) += vsrc_nullsrc.o
+
+ OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
+Index: libavfilter/allfilters.c
+===================================================================
+--- libavfilter/allfilters.c (revision 24294)
++++ libavfilter/allfilters.c (working copy)
+@@ -36,19 +36,32 @@
+
+ REGISTER_FILTER (ASPECT, aspect, vf);
+ REGISTER_FILTER (CROP, crop, vf);
++ REGISTER_FILTER (DRAWBOX, drawbox, vf);
++ REGISTER_FILTER (DRAWTEXT, drawtext, vf);
++ REGISTER_FILTER (FADE, fade, vf);
++ REGISTER_FILTER (FIFO, fifo, vf);
+ REGISTER_FILTER (FORMAT, format, vf);
++ REGISTER_FILTER (FPS, fps, vf);
++ REGISTER_FILTER (HFLIP, hflip, vf);
++ REGISTER_FILTER (NEGATE, negate, vf);
+ REGISTER_FILTER (NOFORMAT, noformat, vf);
+ REGISTER_FILTER (NULL, null, vf);
++ REGISTER_FILTER (OVERLAY, overlay, vf);
+ REGISTER_FILTER (PAD, pad, vf);
+ REGISTER_FILTER (PIXDESCTEST, pixdesctest, vf);
+ REGISTER_FILTER (PIXELASPECT, pixelaspect, vf);
++ REGISTER_FILTER (ROTATE, rotate, vf);
+ REGISTER_FILTER (SCALE, scale, vf);
++ REGISTER_FILTER (SETPTS, setpts, vf);
+ REGISTER_FILTER (SLICIFY, slicify, vf);
++ REGISTER_FILTER (SPLIT, split, vf);
++ REGISTER_FILTER (TRANSPOSE, transpose, vf);
+ REGISTER_FILTER (UNSHARP, unsharp, vf);
+ REGISTER_FILTER (VFLIP, vflip, vf);
+
+ REGISTER_FILTER (BUFFER, buffer, vsrc);
+ REGISTER_FILTER (COLOR, color, vsrc);
++ REGISTER_FILTER (MOVIE, movie, vsrc);
+ REGISTER_FILTER (NULLSRC, nullsrc, vsrc);
+
+ REGISTER_FILTER (NULLSINK, nullsink, vsink);
More information about the FFmpeg-soc
mailing list