[FFmpeg-soc] [soc]: r5932 - in libavfilter: checkout.sh diffs/00_configure.diff diffs/01_build.diff diffs/03_doc_filters.diff
stefano
subversion at mplayerhq.hu
Tue Sep 14 15:43:41 CEST 2010
Author: stefano
Date: Tue Sep 14 15:43:40 2010
New Revision: 5932
Log:
Update to FFmpeg r25118 / libswscale r32241.
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 Tue Sep 7 22:49:24 2010 (r5931)
+++ libavfilter/checkout.sh Tue Sep 14 15:43:40 2010 (r5932)
@@ -1,11 +1,11 @@
#! /bin/sh
echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r24896
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25118
echo "downloading the corresponding version of swscale"
cd ffmpeg/libswscale
-svn up -r32011
+svn up -r32241
cd ../..
echo "patching ffmpeg"
Modified: libavfilter/diffs/00_configure.diff
==============================================================================
--- libavfilter/diffs/00_configure.diff Tue Sep 7 22:49:24 2010 (r5931)
+++ libavfilter/diffs/00_configure.diff Tue Sep 14 15:43:40 2010 (r5932)
@@ -1,8 +1,8 @@
Index: configure
===================================================================
---- configure (revision 24896)
+--- configure (revision 25118)
+++ configure (working copy)
-@@ -168,6 +168,7 @@
+@@ -169,6 +169,7 @@
and libraw1394 [no]
--enable-libdirac enable Dirac support via libdirac [no]
--enable-libfaac enable FAAC support via libfaac [no]
@@ -10,7 +10,7 @@ Index: configure
--enable-libgsm enable GSM support via libgsm [no]
--enable-libmp3lame enable MP3 encoding via libmp3lame [no]
--enable-libnut enable NUT (de)muxing via libnut,
-@@ -873,6 +874,7 @@
+@@ -883,6 +884,7 @@
libdc1394
libdirac
libfaac
@@ -18,7 +18,7 @@ Index: configure
libgsm
libmp3lame
libnut
-@@ -1015,6 +1017,7 @@
+@@ -1026,6 +1028,7 @@
llrintf
local_aligned_16
local_aligned_8
@@ -26,18 +26,16 @@ Index: configure
log2
log2f
loongson
-@@ -1381,6 +1384,10 @@
- tcp_protocol_deps="network"
+@@ -1393,6 +1396,8 @@
udp_protocol_deps="network"
-+# filters
+ # filters
+drawtext_filter_deps="libfreetype"
+movie_filter_deps="avformat"
-+
+ ocv_smooth_filter_deps="libopencv"
+
# libraries
- avdevice_deps="avcodec avformat"
- avformat_deps="avcodec"
-@@ -2604,6 +2611,7 @@
+@@ -2631,6 +2636,7 @@
check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss
check_func inet_aton $network_extralibs
check_func isatty
@@ -45,7 +43,7 @@ Index: configure
check_func ${malloc_prefix}memalign && enable memalign
check_func mkstemp
check_func ${malloc_prefix}posix_memalign && enable posix_memalign
-@@ -2686,6 +2694,7 @@
+@@ -2713,6 +2719,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 Tue Sep 7 22:49:24 2010 (r5931)
+++ libavfilter/diffs/01_build.diff Tue Sep 14 15:43:40 2010 (r5932)
@@ -1,6 +1,6 @@
Index: libavfilter/Makefile
===================================================================
---- libavfilter/Makefile (revision 24896)
+--- libavfilter/Makefile (revision 25118)
+++ libavfilter/Makefile (working copy)
@@ -3,8 +3,9 @@
NAME = avfilter
@@ -13,7 +13,7 @@ Index: libavfilter/Makefile
OBJS = allfilters.o \
avfilter.o \
-@@ -18,21 +19,32 @@
+@@ -18,22 +19,33 @@
OBJS-$(CONFIG_ASPECT_FILTER) += vf_aspect.o
OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o
@@ -27,6 +27,7 @@ Index: libavfilter/Makefile
+OBJS-$(CONFIG_NEGATE_FILTER) += vf_negate.o
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
OBJS-$(CONFIG_PAD_FILTER) += vf_pad.o
OBJS-$(CONFIG_PIXDESCTEST_FILTER) += vf_pixdesctest.o
@@ -48,9 +49,9 @@ Index: libavfilter/Makefile
OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
Index: libavfilter/allfilters.c
===================================================================
---- libavfilter/allfilters.c (revision 24896)
+--- libavfilter/allfilters.c (revision 25118)
+++ libavfilter/allfilters.c (working copy)
-@@ -38,21 +38,32 @@
+@@ -38,22 +38,33 @@
REGISTER_FILTER (ASPECT, aspect, vf);
REGISTER_FILTER (CROP, crop, vf);
@@ -64,6 +65,7 @@ Index: libavfilter/allfilters.c
+ REGISTER_FILTER (NEGATE, negate, vf);
REGISTER_FILTER (NOFORMAT, noformat, vf);
REGISTER_FILTER (NULL, null, vf);
+ REGISTER_FILTER (OCV_SMOOTH, ocv_smooth, vf);
+ REGISTER_FILTER (OVERLAY, overlay, vf);
REGISTER_FILTER (PAD, pad, vf);
REGISTER_FILTER (PIXDESCTEST, pixdesctest, vf);
Modified: libavfilter/diffs/03_doc_filters.diff
==============================================================================
--- libavfilter/diffs/03_doc_filters.diff Tue Sep 7 22:49:24 2010 (r5931)
+++ libavfilter/diffs/03_doc_filters.diff Tue Sep 14 15:43:40 2010 (r5932)
@@ -1,6 +1,6 @@
Index: doc/filters.texi
===================================================================
---- doc/filters.texi (revision 24896)
+--- doc/filters.texi (revision 25118)
+++ doc/filters.texi (working copy)
@@ -55,6 +55,108 @@
@@ -141,9 +141,9 @@ Index: doc/filters.texi
@section noformat
Force libavfilter not to use any of the specified pixel formats for the
-@@ -112,6 +230,56 @@
-
- Pass the video source unchanged to the output.
+@@ -139,6 +257,56 @@
+ documentation for the exact meaning of the parameters:
+ @url{http://opencv.willowgarage.com/documentation/c/image_filtering.html}
+ at section overlay
+
@@ -198,7 +198,7 @@ Index: doc/filters.texi
@section pad
Add paddings to the input image, and places the original input at the
-@@ -159,6 +327,14 @@
+@@ -186,6 +354,14 @@
can be used to test the monowhite pixel format descriptor definition.
@@ -213,7 +213,7 @@ Index: doc/filters.texi
@section scale
Scale the input video to @var{width}:@var{height} and/or convert the image format.
-@@ -184,6 +360,24 @@
+@@ -211,6 +387,24 @@
The default value of @var{width} and @var{height} is 0.
@@ -238,7 +238,7 @@ Index: doc/filters.texi
@section slicify
Pass the images of input video on to next video filter as multiple
-@@ -199,6 +393,19 @@
+@@ -226,6 +420,19 @@
Adding this in the beginning of filter chains should make filtering
faster due to better use of the memory cache.
@@ -258,7 +258,7 @@ Index: doc/filters.texi
@section unsharp
Sharpen or blur the input video.
-@@ -343,6 +550,27 @@
+@@ -370,6 +577,27 @@
"color=red@@0.2:qcif:10 [color]; [in][color] overlay [out]"
@end example
More information about the FFmpeg-soc
mailing list