[FFmpeg-soc] [soc]: r5935 - in libavfilter: checkout.sh diffs/00_configure.diff diffs/01_build.diff diffs/03_doc_filters.diff vf_drawbox.c vf_overlay.c
stefano
subversion at mplayerhq.hu
Tue Sep 28 15:54:10 CEST 2010
Author: stefano
Date: Tue Sep 28 15:54:10 2010
New Revision: 5935
Log:
Update to FFmpeg r25245 / libswscale r32395.
In particular remove the drawbox filter, which is now integrated into
the main SVN repository.
Deleted:
libavfilter/vf_drawbox.c
Modified:
libavfilter/checkout.sh
libavfilter/diffs/00_configure.diff
libavfilter/diffs/01_build.diff
libavfilter/diffs/03_doc_filters.diff
libavfilter/vf_overlay.c
Modified: libavfilter/checkout.sh
==============================================================================
--- libavfilter/checkout.sh Sat Sep 25 23:33:19 2010 (r5934)
+++ libavfilter/checkout.sh Tue Sep 28 15:54:10 2010 (r5935)
@@ -1,11 +1,11 @@
#! /bin/sh
echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25200
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25245
echo "downloading the corresponding version of swscale"
cd ffmpeg/libswscale
-svn up -r32265
+svn up -r32395
cd ../..
echo "patching ffmpeg"
@@ -13,7 +13,6 @@ for diff in $(ls $(pwd)/diffs/*.diff); d
echo "copying files to libavfilter"
cp \
- vf_drawbox.c \
vf_drawtext.c \
vf_fade.c \
vf_fps.c \
Modified: libavfilter/diffs/00_configure.diff
==============================================================================
--- libavfilter/diffs/00_configure.diff Sat Sep 25 23:33:19 2010 (r5934)
+++ libavfilter/diffs/00_configure.diff Tue Sep 28 15:54:10 2010 (r5935)
@@ -1,6 +1,6 @@
Index: configure
===================================================================
---- configure (revision 25200)
+--- configure (revision 25245)
+++ configure (working copy)
@@ -170,6 +170,7 @@
and libraw1394 [no]
@@ -26,16 +26,17 @@ Index: configure
log2
log2f
loongson
-@@ -1401,6 +1404,8 @@
- udp_protocol_deps="network"
+@@ -1399,7 +1402,9 @@
# filters
+ blackframe_filter_deps="gpl"
+drawtext_filter_deps="libfreetype"
+ frei0r_filter_deps="frei0r dlopen strtok_r"
+movie_filter_deps="avformat"
ocv_smooth_filter_deps="libopencv"
yadif_filter_deps="gpl"
-@@ -2649,6 +2654,7 @@
+@@ -2657,6 +2662,7 @@
check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss
check_func inet_aton $network_extralibs
check_func isatty
@@ -43,7 +44,7 @@ Index: configure
check_func ${malloc_prefix}memalign && enable memalign
check_func mkstemp
check_func ${malloc_prefix}posix_memalign && enable posix_memalign
-@@ -2733,6 +2739,7 @@
+@@ -2741,6 +2747,7 @@
require libdirac libdirac_decoder/dirac_parser.h dirac_decoder_init $(pkg-config --libs dirac) &&
require libdirac libdirac_encoder/dirac_encoder.h dirac_encoder_init $(pkg-config --libs dirac)
enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
Modified: libavfilter/diffs/01_build.diff
==============================================================================
--- libavfilter/diffs/01_build.diff Sat Sep 25 23:33:19 2010 (r5934)
+++ libavfilter/diffs/01_build.diff Tue Sep 28 15:54:10 2010 (r5935)
@@ -1,6 +1,6 @@
Index: libavfilter/Makefile
===================================================================
---- libavfilter/Makefile (revision 25200)
+--- libavfilter/Makefile (revision 25245)
+++ libavfilter/Makefile (working copy)
@@ -3,8 +3,9 @@
NAME = avfilter
@@ -13,11 +13,10 @@ Index: libavfilter/Makefile
OBJS = allfilters.o \
avfilter.o \
-@@ -22,18 +23,28 @@
-
- OBJS-$(CONFIG_ASPECT_FILTER) += vf_aspect.o
+@@ -24,24 +25,34 @@
+ OBJS-$(CONFIG_BLACKFRAME_FILTER) += vf_blackframe.o
OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o
-+OBJS-$(CONFIG_DRAWBOX_FILTER) += vf_drawbox.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
@@ -42,7 +41,6 @@ Index: libavfilter/Makefile
OBJS-$(CONFIG_UNSHARP_FILTER) += vf_unsharp.o
OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o
OBJS-$(CONFIG_YADIF_FILTER) += vf_yadif.o
-@@ -42,6 +53,7 @@
OBJS-$(CONFIG_BUFFER_FILTER) += vsrc_buffer.o
OBJS-$(CONFIG_COLOR_FILTER) += vf_pad.o
@@ -52,13 +50,12 @@ Index: libavfilter/Makefile
OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
Index: libavfilter/allfilters.c
===================================================================
---- libavfilter/allfilters.c (revision 25200)
+--- libavfilter/allfilters.c (revision 25245)
+++ libavfilter/allfilters.c (working copy)
-@@ -42,24 +42,35 @@
-
- REGISTER_FILTER (ASPECT, aspect, vf);
+@@ -44,24 +44,34 @@
+ REGISTER_FILTER (BLACKFRAME, blackframe, vf);
REGISTER_FILTER (CROP, crop, vf);
-+ REGISTER_FILTER (DRAWBOX, drawbox, vf);
+ REGISTER_FILTER (DRAWBOX, drawbox, vf);
+ REGISTER_FILTER (DRAWTEXT, drawtext, vf);
+ REGISTER_FILTER (FADE, fade, vf);
REGISTER_FILTER (FIFO, fifo, vf);
Modified: libavfilter/diffs/03_doc_filters.diff
==============================================================================
--- libavfilter/diffs/03_doc_filters.diff Sat Sep 25 23:33:19 2010 (r5934)
+++ libavfilter/diffs/03_doc_filters.diff Tue Sep 28 15:54:10 2010 (r5935)
@@ -1,20 +1,11 @@
Index: doc/filters.texi
===================================================================
---- doc/filters.texi (revision 25200)
+--- doc/filters.texi (revision 25245)
+++ doc/filters.texi (working copy)
-@@ -169,6 +169,108 @@
- "crop=in_w/2:in_h/2:y:10+10*sin(n/10)"
+@@ -222,6 +222,99 @@
+ drawbox=10:20:200:60:red@@0.5"
@end example
-+ at section drawbox
-+
-+ at example
-+./ffmpeg -i in.avi -vf "drawbox=10:20:200:60:red" out.avi
-+ at end example
-+
-+Draw a box with @var{x}:@var{y}:@var{width}:@var{height}:@var{color}
-+dimensions in a chosen color.
-+
+ at section drawtext
+
+Draw text string or text from specified file on top of video using the
@@ -111,7 +102,7 @@ Index: doc/filters.texi
@section fifo
Buffer input images and send them when they are requested.
-@@ -245,6 +347,14 @@
+@@ -298,6 +391,14 @@
For more information see:
@url{http://piksel.org/frei0r}
@@ -126,7 +117,7 @@ Index: doc/filters.texi
@section hflip
Flip the input video horizontally.
-@@ -255,6 +365,14 @@
+@@ -308,6 +409,14 @@
ffmpeg -i in.avi -vf "hflip" out.avi
@end example
@@ -141,7 +132,7 @@ Index: doc/filters.texi
@section noformat
Force libavfilter not to use any of the specified pixel formats for the
-@@ -303,6 +421,56 @@
+@@ -356,6 +465,56 @@
documentation for the exact meaning of the parameters:
@url{http://opencv.willowgarage.com/documentation/c/image_filtering.html}
@@ -198,7 +189,7 @@ Index: doc/filters.texi
@section pad
Add paddings to the input image, and places the original input at the
-@@ -350,6 +518,14 @@
+@@ -403,6 +562,14 @@
can be used to test the monowhite pixel format descriptor definition.
@@ -213,7 +204,7 @@ Index: doc/filters.texi
@section scale
Scale the input video to @var{width}:@var{height} and/or convert the image format.
-@@ -375,6 +551,24 @@
+@@ -428,6 +595,24 @@
The default value of @var{width} and @var{height} is 0.
@@ -238,7 +229,7 @@ Index: doc/filters.texi
@section slicify
Pass the images of input video on to next video filter as multiple
-@@ -390,6 +584,19 @@
+@@ -443,6 +628,19 @@
Adding this in the beginning of filter chains should make filtering
faster due to better use of the memory cache.
@@ -258,7 +249,7 @@ Index: doc/filters.texi
@section unsharp
Sharpen or blur the input video.
-@@ -564,6 +771,27 @@
+@@ -617,6 +815,27 @@
"color=red@@0.2:qcif:10 [color]; [in][color] overlay [out]"
@end example
Modified: libavfilter/vf_overlay.c
==============================================================================
--- libavfilter/vf_overlay.c Sat Sep 25 23:33:19 2010 (r5934)
+++ libavfilter/vf_overlay.c Tue Sep 28 15:54:10 2010 (r5935)
@@ -172,13 +172,13 @@ static void start_frame(AVFilterLink *li
{
OverlayContext *over = link->dst->priv;
/* There shouldn't be any previous queued frame in this queue */
- assert(!over->pics[link->dstpad][1]);
- if (over->pics[link->dstpad][0]) {
+ assert(!over->pics[link->dstpad - link->dst->input_pads][1]);
+ if (over->pics[link->dstpad - link->dst->input_pads][0]) {
/* Queue the new frame */
- over->pics[link->dstpad][1] = picref;
+ over->pics[link->dstpad - link->dst->input_pads][1] = picref;
} else {
/* No previous unused frame, take this one into use directly */
- over->pics[link->dstpad][0] = picref;
+ over->pics[link->dstpad - link->dst->input_pads][0] = picref;
}
}
More information about the FFmpeg-soc
mailing list