[FFmpeg-soc] [soc]: r5930 - in libavfilter: checkout.sh diffs/00_configure.diff diffs/01_build.diff diffs/03_doc_filters.diff vf_fifo.c
stefano
subversion at mplayerhq.hu
Tue Aug 24 11:02:54 CEST 2010
Author: stefano
Date: Tue Aug 24 11:02:54 2010
New Revision: 5930
Log:
Update to FFmpeg r24896 / libswscale r32011.
Deleted:
libavfilter/vf_fifo.c
Modified:
libavfilter/checkout.sh
libavfilter/diffs/00_configure.diff
libavfilter/diffs/01_build.diff
libavfilter/diffs/03_doc_filters.diff
Modified: libavfilter/checkout.sh
==============================================================================
--- libavfilter/checkout.sh Sat Aug 21 05:00:21 2010 (r5929)
+++ libavfilter/checkout.sh Tue Aug 24 11:02:54 2010 (r5930)
@@ -1,11 +1,11 @@
#! /bin/sh
echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r24819
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r24896
echo "downloading the corresponding version of swscale"
cd ffmpeg/libswscale
-svn up -r31972
+svn up -r32011
cd ../..
echo "patching ffmpeg"
@@ -16,7 +16,6 @@ cp \
vf_drawbox.c \
vf_drawtext.c \
vf_fade.c \
- vf_fifo.c \
vf_fps.c \
vf_negate.c \
vf_overlay.c \
Modified: libavfilter/diffs/00_configure.diff
==============================================================================
--- libavfilter/diffs/00_configure.diff Sat Aug 21 05:00:21 2010 (r5929)
+++ libavfilter/diffs/00_configure.diff Tue Aug 24 11:02:54 2010 (r5930)
@@ -1,6 +1,6 @@
Index: configure
===================================================================
---- configure (revision 24819)
+--- configure (revision 24896)
+++ configure (working copy)
@@ -168,6 +168,7 @@
and libraw1394 [no]
@@ -26,7 +26,7 @@ Index: configure
log2
log2f
loongson
-@@ -1380,6 +1383,10 @@
+@@ -1381,6 +1384,10 @@
tcp_protocol_deps="network"
udp_protocol_deps="network"
@@ -37,7 +37,7 @@ Index: configure
# libraries
avdevice_deps="avcodec avformat"
avformat_deps="avcodec"
-@@ -2603,6 +2610,7 @@
+@@ -2604,6 +2611,7 @@
check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss
check_func inet_aton $network_extralibs
check_func isatty
@@ -45,7 +45,7 @@ Index: configure
check_func ${malloc_prefix}memalign && enable memalign
check_func mkstemp
check_func ${malloc_prefix}posix_memalign && enable posix_memalign
-@@ -2685,6 +2693,7 @@
+@@ -2686,6 +2694,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 Aug 21 05:00:21 2010 (r5929)
+++ libavfilter/diffs/01_build.diff Tue Aug 24 11:02:54 2010 (r5930)
@@ -1,6 +1,6 @@
Index: libavfilter/Makefile
===================================================================
---- libavfilter/Makefile (revision 24819)
+--- libavfilter/Makefile (revision 24896)
+++ libavfilter/Makefile (working copy)
@@ -3,8 +3,9 @@
NAME = avfilter
@@ -13,14 +13,14 @@ Index: libavfilter/Makefile
OBJS = allfilters.o \
avfilter.o \
-@@ -16,20 +17,32 @@
+@@ -18,21 +19,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_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
@@ -48,16 +48,16 @@ Index: libavfilter/Makefile
OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
Index: libavfilter/allfilters.c
===================================================================
---- libavfilter/allfilters.c (revision 24819)
+--- libavfilter/allfilters.c (revision 24896)
+++ libavfilter/allfilters.c (working copy)
-@@ -36,20 +36,32 @@
+@@ -38,21 +38,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 (FIFO, fifo, vf);
REGISTER_FILTER (FORMAT, format, vf);
+ REGISTER_FILTER (FPS, fps, vf);
REGISTER_FILTER (HFLIP, hflip, vf);
Modified: libavfilter/diffs/03_doc_filters.diff
==============================================================================
--- libavfilter/diffs/03_doc_filters.diff Sat Aug 21 05:00:21 2010 (r5929)
+++ libavfilter/diffs/03_doc_filters.diff Tue Aug 24 11:02:54 2010 (r5930)
@@ -1,8 +1,8 @@
Index: doc/filters.texi
===================================================================
---- doc/filters.texi (revision 24819)
+--- doc/filters.texi (revision 24896)
+++ doc/filters.texi (working copy)
-@@ -39,6 +39,114 @@
+@@ -55,6 +55,108 @@
The default value of @var{width} and @var{height} is 0.
@@ -108,16 +108,10 @@ Index: doc/filters.texi
+Note that the double quotes are not necessary if spaces are not used within
+the parameter list.
+
-+ at section fifo
-+
-+ at example
-+./ffmpeg -i in.avi -vf "fifo" out.avi
-+ at end example
-+
- @section format
+ @section fifo
- Convert the input video to one of the specified pixel formats.
-@@ -56,6 +164,14 @@
+ Buffer input images and send them when they are requested.
+@@ -81,6 +183,14 @@
will convert the input video to the format ``yuv420p''.
@@ -132,7 +126,7 @@ Index: doc/filters.texi
@section hflip
Flip the input video horizontally.
-@@ -66,6 +182,14 @@
+@@ -91,6 +201,14 @@
ffmpeg -i in.avi -vf "hflip" out.avi
@end example
@@ -147,9 +141,9 @@ Index: doc/filters.texi
@section noformat
Force libavfilter not to use any of the specified pixel formats for the
-@@ -87,6 +211,56 @@
+@@ -112,6 +230,56 @@
- Pass the source unchanged to the output.
+ Pass the video source unchanged to the output.
+ at section overlay
+
@@ -204,7 +198,7 @@ Index: doc/filters.texi
@section pad
Add paddings to the input image, and places the original input at the
-@@ -134,6 +308,14 @@
+@@ -159,6 +327,14 @@
can be used to test the monowhite pixel format descriptor definition.
@@ -219,7 +213,7 @@ Index: doc/filters.texi
@section scale
Scale the input video to @var{width}:@var{height} and/or convert the image format.
-@@ -159,6 +341,24 @@
+@@ -184,6 +360,24 @@
The default value of @var{width} and @var{height} is 0.
@@ -244,7 +238,7 @@ Index: doc/filters.texi
@section slicify
Pass the images of input video on to next video filter as multiple
-@@ -174,6 +374,19 @@
+@@ -199,6 +393,19 @@
Adding this in the beginning of filter chains should make filtering
faster due to better use of the memory cache.
@@ -264,7 +258,7 @@ Index: doc/filters.texi
@section unsharp
Sharpen or blur the input video.
-@@ -318,6 +531,27 @@
+@@ -343,6 +550,27 @@
"color=red@@0.2:qcif:10 [color]; [in][color] overlay [out]"
@end example
More information about the FFmpeg-soc
mailing list