[FFmpeg-soc] [soc]: r5945 - in libavfilter: checkout.sh diffs/00_configure.diff diffs/01_build.diff diffs/03_doc_filters.diff
stefano
subversion at mplayerhq.hu
Mon Jan 17 13:10:17 CET 2011
Author: stefano
Date: Mon Jan 17 13:10:17 2011
New Revision: 5945
Log:
Update to FFmpeg SVN r26400 / libswscale r32676.
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 Sun Dec 12 19:35:50 2010 (r5944)
+++ libavfilter/checkout.sh Mon Jan 17 13:10:17 2011 (r5945)
@@ -1,7 +1,7 @@
#! /bin/sh
echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25942
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r26400
echo "downloading the corresponding version of swscale"
cd ffmpeg/libswscale
Modified: libavfilter/diffs/00_configure.diff
==============================================================================
--- libavfilter/diffs/00_configure.diff Sun Dec 12 19:35:50 2010 (r5944)
+++ libavfilter/diffs/00_configure.diff Mon Jan 17 13:10:17 2011 (r5945)
@@ -1,6 +1,6 @@
Index: configure
===================================================================
---- configure (revision 25942)
+--- configure (revision 26400)
+++ configure (working copy)
@@ -170,6 +170,7 @@
and libraw1394 [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,
-@@ -885,6 +886,7 @@
+@@ -886,6 +887,7 @@
libdc1394
libdirac
libfaac
@@ -18,7 +18,7 @@ Index: configure
libgsm
libmp3lame
libnut
-@@ -1030,6 +1032,7 @@
+@@ -1031,6 +1033,7 @@
llrintf
local_aligned_16
local_aligned_8
@@ -26,7 +26,7 @@ Index: configure
log2
log2f
loongson
-@@ -1406,9 +1409,11 @@
+@@ -1412,11 +1415,13 @@
# filters
blackframe_filter_deps="gpl"
cropdetect_filter_deps="gpl"
@@ -35,18 +35,21 @@ Index: configure
frei0r_src_filter_deps="frei0r dlopen strtok_r"
hqdn3d_filter_deps="gpl"
+movie_filter_deps="avformat"
- ocv_smooth_filter_deps="libopencv"
++ocv_filter_deps="libopencv"
+ scale_filter_deps="swscale"
+-ocv_filter_deps="libopencv"
yadif_filter_deps="gpl"
-@@ -2669,6 +2674,7 @@
+ # libraries
+@@ -2677,6 +2682,7 @@
check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss
check_func inet_aton $network_extralibs
check_func isatty
+check_func localtime_r
check_func ${malloc_prefix}memalign && enable memalign
check_func mkstemp
- check_func ${malloc_prefix}posix_memalign && enable posix_memalign
-@@ -2753,6 +2759,7 @@
+ check_func mmap
+@@ -2763,6 +2769,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 Sun Dec 12 19:35:50 2010 (r5944)
+++ libavfilter/diffs/01_build.diff Mon Jan 17 13:10:17 2011 (r5945)
@@ -1,6 +1,6 @@
Index: libavfilter/Makefile
===================================================================
---- libavfilter/Makefile (revision 25942)
+--- libavfilter/Makefile (revision 26400)
+++ libavfilter/Makefile (working copy)
@@ -3,6 +3,7 @@
NAME = avfilter
@@ -10,7 +10,7 @@ Index: libavfilter/Makefile
HEADERS = avfilter.h avfiltergraph.h
-@@ -23,24 +24,30 @@
+@@ -24,24 +25,30 @@
OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o
OBJS-$(CONFIG_CROPDETECT_FILTER) += vf_cropdetect.o
OBJS-$(CONFIG_DRAWBOX_FILTER) += vf_drawbox.o
@@ -26,7 +26,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_OCV_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
@@ -41,7 +41,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
-@@ -49,6 +56,7 @@
+@@ -50,6 +57,7 @@
OBJS-$(CONFIG_BUFFER_FILTER) += vsrc_buffer.o
OBJS-$(CONFIG_COLOR_FILTER) += vf_pad.o
OBJS-$(CONFIG_FREI0R_SRC_FILTER) += vf_frei0r.o
@@ -51,9 +51,9 @@ Index: libavfilter/Makefile
OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
Index: libavfilter/allfilters.c
===================================================================
---- libavfilter/allfilters.c (revision 25942)
+--- libavfilter/allfilters.c (revision 26400)
+++ libavfilter/allfilters.c (working copy)
-@@ -44,24 +44,30 @@
+@@ -45,24 +45,30 @@
REGISTER_FILTER (CROP, crop, vf);
REGISTER_FILTER (CROPDETECT, cropdetect, vf);
REGISTER_FILTER (DRAWBOX, drawbox, vf);
@@ -69,7 +69,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 (OCV, ocv, vf);
REGISTER_FILTER (OVERLAY, overlay, vf);
REGISTER_FILTER (PAD, pad, vf);
REGISTER_FILTER (PIXDESCTEST, pixdesctest, vf);
@@ -84,7 +84,7 @@ Index: libavfilter/allfilters.c
REGISTER_FILTER (TRANSPOSE, transpose, vf);
REGISTER_FILTER (UNSHARP, unsharp, vf);
REGISTER_FILTER (VFLIP, vflip, vf);
-@@ -70,6 +76,7 @@
+@@ -71,6 +77,7 @@
REGISTER_FILTER (BUFFER, buffer, vsrc);
REGISTER_FILTER (COLOR, color, vsrc);
REGISTER_FILTER (FREI0R, frei0r_src, vsrc);
Modified: libavfilter/diffs/03_doc_filters.diff
==============================================================================
--- libavfilter/diffs/03_doc_filters.diff Sun Dec 12 19:35:50 2010 (r5944)
+++ libavfilter/diffs/03_doc_filters.diff Mon Jan 17 13:10:17 2011 (r5945)
@@ -1,8 +1,8 @@
Index: doc/filters.texi
===================================================================
---- doc/filters.texi (revision 25942)
+--- doc/filters.texi (revision 26400)
+++ doc/filters.texi (working copy)
-@@ -348,6 +348,99 @@
+@@ -353,6 +353,99 @@
drawbox=10:20:200:60:red@@0.5"
@end example
@@ -102,7 +102,7 @@ Index: doc/filters.texi
@section fifo
Buffer input images and send them when they are requested.
-@@ -425,6 +518,14 @@
+@@ -431,6 +524,14 @@
For more information see:
@url{http://piksel.org/frei0r}
@@ -117,7 +117,7 @@ Index: doc/filters.texi
@section gradfun
Fix the banding artifacts that are sometimes introduced into nearly flat
-@@ -491,6 +592,14 @@
+@@ -497,6 +598,14 @@
@var{luma_tmp}*@var{chroma_spatial}/@var{luma_spatial}
@end table
@@ -132,7 +132,7 @@ Index: doc/filters.texi
@section noformat
Force libavfilter not to use any of the specified pixel formats for the
-@@ -653,6 +762,14 @@
+@@ -731,6 +840,14 @@
can be used to test the monowhite pixel format descriptor definition.
@@ -147,7 +147,7 @@ Index: doc/filters.texi
@section scale
Scale the input video to @var{width}:@var{height} and/or convert the image format.
-@@ -783,6 +900,11 @@
+@@ -861,6 +978,11 @@
Adding this in the beginning of filter chains should make filtering
faster due to better use of the memory cache.
@@ -159,7 +159,7 @@ Index: doc/filters.texi
@section transpose
Transpose rows with columns in the input video and optionally flip it.
-@@ -1001,6 +1123,27 @@
+@@ -1088,6 +1210,27 @@
"color=red@@0.2:qcif:10 [color]; [in][color] overlay [out]"
@end example
More information about the FFmpeg-soc
mailing list