[FFmpeg-soc] [soc]: r5936 - in libavfilter: checkout.sh diffs/00_configure.diff diffs/01_build.diff diffs/03_doc_filters.diff
stefano
subversion at mplayerhq.hu
Tue Oct 12 12:31:03 CEST 2010
Author: stefano
Date: Tue Oct 12 12:31:02 2010
New Revision: 5936
Log:
Update to FFmpeg r25447 / libswscale r32424.
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 28 15:54:10 2010 (r5935)
+++ libavfilter/checkout.sh Tue Oct 12 12:31:02 2010 (r5936)
@@ -1,11 +1,11 @@
#! /bin/sh
echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25245
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25447
echo "downloading the corresponding version of swscale"
cd ffmpeg/libswscale
-svn up -r32395
+svn up -r32424
cd ../..
echo "patching ffmpeg"
Modified: libavfilter/diffs/00_configure.diff
==============================================================================
--- libavfilter/diffs/00_configure.diff Tue Sep 28 15:54:10 2010 (r5935)
+++ libavfilter/diffs/00_configure.diff Tue Oct 12 12:31:02 2010 (r5936)
@@ -1,6 +1,6 @@
Index: configure
===================================================================
---- configure (revision 25245)
+--- configure (revision 25447)
+++ configure (working copy)
@@ -170,6 +170,7 @@
and libraw1394 [no]
@@ -26,17 +26,17 @@ Index: configure
log2
log2f
loongson
-@@ -1399,7 +1402,9 @@
-
+@@ -1400,7 +1403,9 @@
# filters
blackframe_filter_deps="gpl"
+ cropdetect_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"
-@@ -2657,6 +2662,7 @@
+@@ -2661,6 +2666,7 @@
check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss
check_func inet_aton $network_extralibs
check_func isatty
@@ -44,11 +44,11 @@ Index: configure
check_func ${malloc_prefix}memalign && enable memalign
check_func mkstemp
check_func ${malloc_prefix}posix_memalign && enable posix_memalign
-@@ -2741,6 +2747,7 @@
+@@ -2745,6 +2751,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
+enabled libfreetype && add_cflags $(pkg-config --cflags freetype2) && require libfreetype ft2build.h FT_Init_FreeType -lfreetype -lz
enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm
- enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h hip_decode_init -lmp3lame
+ enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
enabled libnut && require libnut libnut.h nut_demuxer_init -lnut
Modified: libavfilter/diffs/01_build.diff
==============================================================================
--- libavfilter/diffs/01_build.diff Tue Sep 28 15:54:10 2010 (r5935)
+++ libavfilter/diffs/01_build.diff Tue Oct 12 12:31:02 2010 (r5936)
@@ -1,6 +1,6 @@
Index: libavfilter/Makefile
===================================================================
---- libavfilter/Makefile (revision 25245)
+--- libavfilter/Makefile (revision 25447)
+++ libavfilter/Makefile (working copy)
@@ -3,8 +3,9 @@
NAME = avfilter
@@ -13,16 +13,16 @@ Index: libavfilter/Makefile
OBJS = allfilters.o \
avfilter.o \
-@@ -24,24 +25,34 @@
- OBJS-$(CONFIG_BLACKFRAME_FILTER) += vf_blackframe.o
+@@ -25,25 +26,35 @@
OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o
+ OBJS-$(CONFIG_CROPDETECT_FILTER) += vf_cropdetect.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_FORMAT_FILTER) += vf_format.o
- OBJS-$(CONFIG_FREI0R_FILTER) += vf_frei0r.o
+OBJS-$(CONFIG_FPS_FILTER) += vf_fps.o
+ OBJS-$(CONFIG_FREI0R_FILTER) += vf_frei0r.o
OBJS-$(CONFIG_HFLIP_FILTER) += vf_hflip.o
+OBJS-$(CONFIG_NEGATE_FILTER) += vf_negate.o
OBJS-$(CONFIG_NOFORMAT_FILTER) += vf_format.o
@@ -35,6 +35,7 @@ Index: libavfilter/Makefile
+OBJS-$(CONFIG_ROTATE_FILTER) += vf_rotate.o
OBJS-$(CONFIG_SCALE_FILTER) += vf_scale.o
+OBJS-$(CONFIG_SETPTS_FILTER) += vf_setpts.o
+ OBJS-$(CONFIG_SETTB_FILTER) += vf_settb.o
OBJS-$(CONFIG_SLICIFY_FILTER) += vf_slicify.o
+OBJS-$(CONFIG_SPLIT_FILTER) += vf_split.o
+OBJS-$(CONFIG_TRANSPOSE_FILTER) += vf_transpose.o
@@ -50,18 +51,18 @@ Index: libavfilter/Makefile
OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
Index: libavfilter/allfilters.c
===================================================================
---- libavfilter/allfilters.c (revision 25245)
+--- libavfilter/allfilters.c (revision 25447)
+++ libavfilter/allfilters.c (working copy)
-@@ -44,24 +44,34 @@
- REGISTER_FILTER (BLACKFRAME, blackframe, vf);
+@@ -45,25 +45,35 @@
REGISTER_FILTER (CROP, crop, vf);
+ REGISTER_FILTER (CROPDETECT, cropdetect, vf);
REGISTER_FILTER (DRAWBOX, drawbox, vf);
+ REGISTER_FILTER (DRAWTEXT, drawtext, vf);
+ REGISTER_FILTER (FADE, fade, vf);
REGISTER_FILTER (FIFO, fifo, vf);
REGISTER_FILTER (FORMAT, format, vf);
- REGISTER_FILTER (FREI0R, frei0r, vf);
+ REGISTER_FILTER (FPS, fps, vf);
+ REGISTER_FILTER (FREI0R, frei0r, vf);
REGISTER_FILTER (HFLIP, hflip, vf);
+ REGISTER_FILTER (NEGATE, negate, vf);
REGISTER_FILTER (NOFORMAT, noformat, vf);
@@ -73,6 +74,7 @@ Index: libavfilter/allfilters.c
REGISTER_FILTER (PIXELASPECT, pixelaspect, vf);
+ REGISTER_FILTER (ROTATE, rotate, vf);
REGISTER_FILTER (SCALE, scale, vf);
+ REGISTER_FILTER (SETTB, settb, vf);
+ REGISTER_FILTER (SETPTS, setpts, vf);
REGISTER_FILTER (SLICIFY, slicify, vf);
+ REGISTER_FILTER (SPLIT, split, vf);
Modified: libavfilter/diffs/03_doc_filters.diff
==============================================================================
--- libavfilter/diffs/03_doc_filters.diff Tue Sep 28 15:54:10 2010 (r5935)
+++ libavfilter/diffs/03_doc_filters.diff Tue Oct 12 12:31:02 2010 (r5936)
@@ -1,8 +1,8 @@
Index: doc/filters.texi
===================================================================
---- doc/filters.texi (revision 25245)
+--- doc/filters.texi (revision 25447)
+++ doc/filters.texi (working copy)
-@@ -222,6 +222,99 @@
+@@ -257,6 +257,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.
-@@ -298,6 +391,14 @@
+@@ -333,6 +426,14 @@
For more information see:
@url{http://piksel.org/frei0r}
@@ -117,7 +117,7 @@ Index: doc/filters.texi
@section hflip
Flip the input video horizontally.
-@@ -308,6 +409,14 @@
+@@ -343,6 +444,14 @@
ffmpeg -i in.avi -vf "hflip" out.avi
@end example
@@ -132,7 +132,7 @@ Index: doc/filters.texi
@section noformat
Force libavfilter not to use any of the specified pixel formats for the
-@@ -356,6 +465,56 @@
+@@ -391,6 +500,56 @@
documentation for the exact meaning of the parameters:
@url{http://opencv.willowgarage.com/documentation/c/image_filtering.html}
@@ -189,7 +189,7 @@ Index: doc/filters.texi
@section pad
Add paddings to the input image, and places the original input at the
-@@ -403,6 +562,14 @@
+@@ -438,6 +597,14 @@
can be used to test the monowhite pixel format descriptor definition.
@@ -204,7 +204,7 @@ Index: doc/filters.texi
@section scale
Scale the input video to @var{width}:@var{height} and/or convert the image format.
-@@ -428,6 +595,24 @@
+@@ -463,6 +630,24 @@
The default value of @var{width} and @var{height} is 0.
@@ -226,10 +226,10 @@ Index: doc/filters.texi
+
+Modifies the presentation timestamp (PTS) of the input video.
+
- @section slicify
+ @section settb
- Pass the images of input video on to next video filter as multiple
-@@ -443,6 +628,19 @@
+ Set the timebase to use for the output frames timestamps.
+@@ -508,6 +693,19 @@
Adding this in the beginning of filter chains should make filtering
faster due to better use of the memory cache.
@@ -249,7 +249,7 @@ Index: doc/filters.texi
@section unsharp
Sharpen or blur the input video.
-@@ -617,6 +815,27 @@
+@@ -682,6 +880,27 @@
"color=red@@0.2:qcif:10 [color]; [in][color] overlay [out]"
@end example
More information about the FFmpeg-soc
mailing list