[FFmpeg-soc] [soc]: r5943 - in libavfilter: checkout.sh diffs/00_configure.diff diffs/01_build.diff diffs/03_doc_filters.diff vf_drawtext.c vf_overlay.c
stefano
subversion at mplayerhq.hu
Sun Nov 21 21:21:37 CET 2010
Author: stefano
Date: Sun Nov 21 21:21:37 2010
New Revision: 5943
Log:
Update to FFmpeg r25789. In particular remove the overlay filter,
which is now included in the main repo.
Deleted:
libavfilter/vf_overlay.c
Modified:
libavfilter/checkout.sh
libavfilter/diffs/00_configure.diff
libavfilter/diffs/01_build.diff
libavfilter/diffs/03_doc_filters.diff
libavfilter/vf_drawtext.c
Modified: libavfilter/checkout.sh
==============================================================================
--- libavfilter/checkout.sh Sat Nov 13 11:05:28 2010 (r5942)
+++ libavfilter/checkout.sh Sun Nov 21 21:21:37 2010 (r5943)
@@ -1,7 +1,7 @@
#! /bin/sh
echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25741
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25789
echo "downloading the corresponding version of swscale"
cd ffmpeg/libswscale
@@ -17,7 +17,6 @@ cp \
vf_fade.c \
vf_fps.c \
vf_negate.c \
- vf_overlay.c \
vf_rotate.c \
vf_split.c \
vsrc_movie.c \
Modified: libavfilter/diffs/00_configure.diff
==============================================================================
--- libavfilter/diffs/00_configure.diff Sat Nov 13 11:05:28 2010 (r5942)
+++ libavfilter/diffs/00_configure.diff Sun Nov 21 21:21:37 2010 (r5943)
@@ -1,6 +1,6 @@
Index: configure
===================================================================
---- configure (revision 25741)
+--- configure (revision 25789)
+++ configure (working copy)
@@ -170,6 +170,7 @@
and libraw1394 [no]
Modified: libavfilter/diffs/01_build.diff
==============================================================================
--- libavfilter/diffs/01_build.diff Sat Nov 13 11:05:28 2010 (r5942)
+++ libavfilter/diffs/01_build.diff Sun Nov 21 21:21:37 2010 (r5943)
@@ -1,16 +1,16 @@
Index: libavfilter/Makefile
===================================================================
---- libavfilter/Makefile (revision 25741)
+--- libavfilter/Makefile (revision 25789)
+++ libavfilter/Makefile (working copy)
@@ -3,6 +3,7 @@
NAME = avfilter
- FFLIBS = avcodec avcore avutil
+ FFLIBS = avcore avutil
FFLIBS-$(CONFIG_SCALE_FILTER) += swscale
+FFLIBS-$(CONFIG_MOVIE_FILTER) += avformat
HEADERS = avfilter.h avfiltergraph.h
-@@ -25,20 +26,27 @@
+@@ -24,10 +25,14 @@
OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o
OBJS-$(CONFIG_CROPDETECT_FILTER) += vf_cropdetect.o
OBJS-$(CONFIG_DRAWBOX_FILTER) += vf_drawbox.o
@@ -25,7 +25,7 @@ Index: libavfilter/Makefile
OBJS-$(CONFIG_NOFORMAT_FILTER) += vf_format.o
OBJS-$(CONFIG_NULL_FILTER) += vf_null.o
OBJS-$(CONFIG_OCV_SMOOTH_FILTER) += vf_libopencv.o
-+OBJS-$(CONFIG_OVERLAY_FILTER) += vf_overlay.o
+@@ -35,10 +40,12 @@
OBJS-$(CONFIG_PAD_FILTER) += vf_pad.o
OBJS-$(CONFIG_PIXDESCTEST_FILTER) += vf_pixdesctest.o
OBJS-$(CONFIG_PIXELASPECT_FILTER) += vf_aspect.o
@@ -38,7 +38,7 @@ Index: libavfilter/Makefile
OBJS-$(CONFIG_TRANSPOSE_FILTER) += vf_transpose.o
OBJS-$(CONFIG_UNSHARP_FILTER) += vf_unsharp.o
OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o
-@@ -46,6 +54,7 @@
+@@ -46,6 +53,7 @@
OBJS-$(CONFIG_BUFFER_FILTER) += vsrc_buffer.o
OBJS-$(CONFIG_COLOR_FILTER) += vf_pad.o
@@ -48,9 +48,9 @@ Index: libavfilter/Makefile
OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
Index: libavfilter/allfilters.c
===================================================================
---- libavfilter/allfilters.c (revision 25741)
+--- libavfilter/allfilters.c (revision 25789)
+++ libavfilter/allfilters.c (working copy)
-@@ -45,20 +45,27 @@
+@@ -45,10 +45,14 @@
REGISTER_FILTER (CROP, crop, vf);
REGISTER_FILTER (CROPDETECT, cropdetect, vf);
REGISTER_FILTER (DRAWBOX, drawbox, vf);
@@ -65,7 +65,7 @@ Index: libavfilter/allfilters.c
REGISTER_FILTER (NOFORMAT, noformat, vf);
REGISTER_FILTER (NULL, null, vf);
REGISTER_FILTER (OCV_SMOOTH, ocv_smooth, vf);
-+ REGISTER_FILTER (OVERLAY, overlay, vf);
+@@ -56,10 +60,12 @@
REGISTER_FILTER (PAD, pad, vf);
REGISTER_FILTER (PIXDESCTEST, pixdesctest, vf);
REGISTER_FILTER (PIXELASPECT, pixelaspect, vf);
@@ -78,7 +78,7 @@ Index: libavfilter/allfilters.c
REGISTER_FILTER (TRANSPOSE, transpose, vf);
REGISTER_FILTER (UNSHARP, unsharp, vf);
REGISTER_FILTER (VFLIP, vflip, vf);
-@@ -66,6 +73,7 @@
+@@ -67,6 +73,7 @@
REGISTER_FILTER (BUFFER, buffer, vsrc);
REGISTER_FILTER (COLOR, color, vsrc);
Modified: libavfilter/diffs/03_doc_filters.diff
==============================================================================
--- libavfilter/diffs/03_doc_filters.diff Sat Nov 13 11:05:28 2010 (r5942)
+++ libavfilter/diffs/03_doc_filters.diff Sun Nov 21 21:21:37 2010 (r5943)
@@ -1,6 +1,6 @@
Index: doc/filters.texi
===================================================================
---- doc/filters.texi (revision 25741)
+--- doc/filters.texi (revision 25789)
+++ doc/filters.texi (working copy)
@@ -257,6 +257,99 @@
drawbox=10:20:200:60:red@@0.5"
@@ -132,62 +132,7 @@ Index: doc/filters.texi
@section noformat
Force libavfilter not to use any of the specified pixel formats for the
-@@ -391,6 +500,54 @@
- documentation for the exact meaning of the parameters:
- @url{http://opencv.willowgarage.com/documentation/c/image_filtering.html}
-
-+ at section overlay
-+
-+Overlay one video on top of another (see the example in the introduction
-+section).
-+Be aware that frames are taken
-+from each input video in timestamp order, hence, if their initial
-+timestamps differ, it is a a good idea to pass the two
-+inputs through a @var{setpts=PTS-STARTPTS} filter to have them
-+begin in the same zero timestamp, as it does the example for
-+the @var{movie} filter.
-+
-+Parameters to the filter are separated by a colon. The first parameter
-+is the x coordinate of the overlay, the second parameter is the y
-+coordinate. The parameters need not be constant expressions, but may
-+be expressions containing the names @var{main_w}, @var{main_h},
-+ at var{overlay_w} and @var{overlay_h}, for the size of the first and second
-+input video, respectively. For example,
-+ at example
-+overlay=main_w-overlay_w-10:main_h-overlay_h-10
-+ at end example
-+can be used to draw the overlay at 10 pixels from the bottom right
-+corner of the main video.
-+
-+The filter accepts a third optional parameter, if set to a value
-+different than 0, it will alpha-blend the overlayed video on top of
-+the first one.
-+
-+This can be used in particular for performing watermarking effects, or
-+for adding a logo on top of the input video.
-+
-+For example, the following command will insert a transparent PNG
-+logo in the bottom left corner of the input video:
-+ at example
-+movie=0:png:logo.png [logo]; [in][logo] overlay=10:main_h-overlay_h-10 [out]
-+ at end example
-+
-+The following example will insert 2 different transparent PNG
-+logos (second logo on bottom right corner):
-+ at example
-+movie=0:png:logo1.png [logo1];
-+movie=0:png:logo2.png [logo2];
-+[in][logo1] overlay=10:main_h-overlay_h-10 [in+logo1];
-+[in+logo1][logo2] overlay=main_w-overlay_w-10:main_h-overlay_h-10 [out]
-+ at end example
-+
-+You could chain and add more overlays this way but the efficiency of
-+such approach is yet to be tested.
-+
- @section pad
-
- Add paddings to the input image, and places the original input at the
-@@ -447,6 +604,14 @@
+@@ -505,6 +614,14 @@
can be used to test the monowhite pixel format descriptor definition.
@@ -202,7 +147,7 @@ Index: doc/filters.texi
@section scale
Scale the input video to @var{width}:@var{height} and/or convert the image format.
-@@ -577,6 +742,11 @@
+@@ -635,6 +752,11 @@
Adding this in the beginning of filter chains should make filtering
faster due to better use of the memory cache.
@@ -214,7 +159,7 @@ Index: doc/filters.texi
@section transpose
Transpose rows with columns in the input video and optionally flip it.
-@@ -795,6 +965,27 @@
+@@ -853,6 +975,27 @@
"color=red@@0.2:qcif:10 [color]; [in][color] overlay [out]"
@end example
Modified: libavfilter/vf_drawtext.c
==============================================================================
--- libavfilter/vf_drawtext.c Sat Nov 13 11:05:28 2010 (r5942)
+++ libavfilter/vf_drawtext.c Sun Nov 21 21:21:37 2010 (r5943)
@@ -25,10 +25,11 @@
* Drawtext Filter
*/
-#include "avfilter.h"
-#include "parseutils.h"
#include "libavutil/colorspace.h"
+#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
+#include "libavcore/parseutils.h"
+#include "avfilter.h"
#undef time
#include <sys/time.h>
@@ -127,7 +128,7 @@ static inline int extract_color(AVFilter
{
uint8_t rgba[4];
uint8_t err;
- if ((err = av_parse_color(rgba, color_str, ctx))) {
+ if ((err = av_parse_color(rgba, color_str, -1, ctx))) {
return err;
}
color[0] = RGB_TO_Y(rgba[0], rgba[1], rgba[2]);
More information about the FFmpeg-soc
mailing list