November 2010 - FFmpeg-soc - lists.ffmpeg.org

[PATCH] Revert 2 changes from a recent commit. They were not really cosmetic.
by Justin Ruggles 11 Dec '10

11 Dec '10

--- libavcodec/ac3enc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

2 4

[soc]: r5943 - in libavfilter: checkout.sh diffs/00_configure.diff diffs/01_build.diff diffs/03_doc_filters.diff vf_drawtext.c vf_overlay.c
by stefano 21 Nov '10

21 Nov '10

Author: stefano Date: Sun Nov 21 21:21:37 2010 New Revision: 5943 Log: Update to FFmpeg r25789. In particular remove the overlay filter, which is now included in the main repo. Deleted: libavfilter/vf_overlay.c Modified: libavfilter/checkout.sh libavfilter/diffs/00_configure.diff libavfilter/diffs/01_build.diff libavfilter/diffs/03_doc_filters.diff libavfilter/vf_drawtext.c Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Sat Nov 13 11:05:28 2010 (r5942) +++ libavfilter/checkout.sh Sun Nov 21 21:21:37 2010 (r5943) @@ -1,7 +1,7 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25741 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25789 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale @@ -17,7 +17,6 @@ cp \ vf_fade.c \ vf_fps.c \ vf_negate.c \ - vf_overlay.c \ vf_rotate.c \ vf_split.c \ vsrc_movie.c \ Modified: libavfilter/diffs/00_configure.diff ============================================================================== --- libavfilter/diffs/00_configure.diff Sat Nov 13 11:05:28 2010 (r5942) +++ libavfilter/diffs/00_configure.diff Sun Nov 21 21:21:37 2010 (r5943) @@ -1,6 +1,6 @@ Index: configure =================================================================== ---- configure (revision 25741) +--- configure (revision 25789) +++ configure (working copy) @@ -170,6 +170,7 @@ and libraw1394 [no] Modified: libavfilter/diffs/01_build.diff ============================================================================== --- libavfilter/diffs/01_build.diff Sat Nov 13 11:05:28 2010 (r5942) +++ libavfilter/diffs/01_build.diff Sun Nov 21 21:21:37 2010 (r5943) @@ -1,16 +1,16 @@ Index: libavfilter/Makefile =================================================================== ---- libavfilter/Makefile (revision 25741) +--- libavfilter/Makefile (revision 25789) +++ libavfilter/Makefile (working copy) @@ -3,6 +3,7 @@ NAME = avfilter - FFLIBS = avcodec avcore avutil + FFLIBS = avcore avutil FFLIBS-$(CONFIG_SCALE_FILTER) += swscale +FFLIBS-$(CONFIG_MOVIE_FILTER) += avformat HEADERS = avfilter.h avfiltergraph.h -@@ -25,20 +26,27 @@ +@@ -24,10 +25,14 @@ OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o OBJS-$(CONFIG_CROPDETECT_FILTER) += vf_cropdetect.o OBJS-$(CONFIG_DRAWBOX_FILTER) += vf_drawbox.o @@ -25,7 +25,7 @@ Index: libavfilter/Makefile 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 +@@ -35,10 +40,12 @@ OBJS-$(CONFIG_PAD_FILTER) += vf_pad.o OBJS-$(CONFIG_PIXDESCTEST_FILTER) += vf_pixdesctest.o OBJS-$(CONFIG_PIXELASPECT_FILTER) += vf_aspect.o @@ -38,7 +38,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 -@@ -46,6 +54,7 @@ +@@ -46,6 +53,7 @@ OBJS-$(CONFIG_BUFFER_FILTER) += vsrc_buffer.o OBJS-$(CONFIG_COLOR_FILTER) += vf_pad.o @@ -48,9 +48,9 @@ Index: libavfilter/Makefile OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o Index: libavfilter/allfilters.c =================================================================== ---- libavfilter/allfilters.c (revision 25741) +--- libavfilter/allfilters.c (revision 25789) +++ libavfilter/allfilters.c (working copy) -@@ -45,20 +45,27 @@ +@@ -45,10 +45,14 @@ REGISTER_FILTER (CROP, crop, vf); REGISTER_FILTER (CROPDETECT, cropdetect, vf); REGISTER_FILTER (DRAWBOX, drawbox, vf); @@ -65,7 +65,7 @@ Index: libavfilter/allfilters.c REGISTER_FILTER (NOFORMAT, noformat, vf); REGISTER_FILTER (NULL, null, vf); REGISTER_FILTER (OCV_SMOOTH, ocv_smooth, vf); -+ REGISTER_FILTER (OVERLAY, overlay, vf); +@@ -56,10 +60,12 @@ REGISTER_FILTER (PAD, pad, vf); REGISTER_FILTER (PIXDESCTEST, pixdesctest, vf); REGISTER_FILTER (PIXELASPECT, pixelaspect, vf); @@ -78,7 +78,7 @@ Index: libavfilter/allfilters.c REGISTER_FILTER (TRANSPOSE, transpose, vf); REGISTER_FILTER (UNSHARP, unsharp, vf); REGISTER_FILTER (VFLIP, vflip, vf); -@@ -66,6 +73,7 @@ +@@ -67,6 +73,7 @@ REGISTER_FILTER (BUFFER, buffer, vsrc); REGISTER_FILTER (COLOR, color, vsrc); Modified: libavfilter/diffs/03_doc_filters.diff ============================================================================== --- libavfilter/diffs/03_doc_filters.diff Sat Nov 13 11:05:28 2010 (r5942) +++ libavfilter/diffs/03_doc_filters.diff Sun Nov 21 21:21:37 2010 (r5943) @@ -1,6 +1,6 @@ Index: doc/filters.texi =================================================================== ---- doc/filters.texi (revision 25741) +--- doc/filters.texi (revision 25789) +++ doc/filters.texi (working copy) @@ -257,6 +257,99 @@ drawbox=10:20:200:60:red@@0.5" @@ -132,62 +132,7 @@ Index: doc/filters.texi @section noformat Force libavfilter not to use any of the specified pixel formats for the -@@ -391,6 +500,54 @@ - documentation for the exact meaning of the parameters: - @url{http://opencv.willowgarage.com/documentation/c/image_filtering.html} - -+@section overlay -+ -+Overlay one video on top of another (see the example in the introduction -+section). -+Be aware that frames are taken -+from each input video in timestamp order, hence, if their initial -+timestamps differ, it is a a good idea to pass the two -+inputs through a @var{setpts=PTS-STARTPTS} filter to have them -+begin in the same zero timestamp, as it does the example for -+the @var{movie} filter. -+ -+Parameters to the filter are separated by a colon. The first parameter -+is the x coordinate of the overlay, the second parameter is the y -+coordinate. The parameters need not be constant expressions, but may -+be expressions containing the names @var{main_w}, @var{main_h}, -+@var{overlay_w} and @var{overlay_h}, for the size of the first and second -+input video, respectively. For example, -+@example -+overlay=main_w-overlay_w-10:main_h-overlay_h-10 -+@end example -+can be used to draw the overlay at 10 pixels from the bottom right -+corner of the main video. -+ -+The filter accepts a third optional parameter, if set to a value -+different than 0, it will alpha-blend the overlayed video on top of -+the first one. -+ -+This can be used in particular for performing watermarking effects, or -+for adding a logo on top of the input video. -+ -+For example, the following command will insert a transparent PNG -+logo in the bottom left corner of the input video: -+@example -+movie=0:png:logo.png [logo]; [in][logo] overlay=10:main_h-overlay_h-10 [out] -+@end example -+ -+The following example will insert 2 different transparent PNG -+logos (second logo on bottom right corner): -+@example -+movie=0:png:logo1.png [logo1]; -+movie=0:png:logo2.png [logo2]; -+[in][logo1] overlay=10:main_h-overlay_h-10 [in+logo1]; -+[in+logo1][logo2] overlay=main_w-overlay_w-10:main_h-overlay_h-10 [out] -+@end example -+ -+You could chain and add more overlays this way but the efficiency of -+such approach is yet to be tested. -+ - @section pad - - Add paddings to the input image, and places the original input at the -@@ -447,6 +604,14 @@ +@@ -505,6 +614,14 @@ can be used to test the monowhite pixel format descriptor definition. @@ -202,7 +147,7 @@ Index: doc/filters.texi @section scale Scale the input video to @var{width}:@var{height} and/or convert the image format. -@@ -577,6 +742,11 @@ +@@ -635,6 +752,11 @@ Adding this in the beginning of filter chains should make filtering faster due to better use of the memory cache. @@ -214,7 +159,7 @@ Index: doc/filters.texi @section transpose Transpose rows with columns in the input video and optionally flip it. -@@ -795,6 +965,27 @@ +@@ -853,6 +975,27 @@ "color=red@@0.2:qcif:10 [color]; [in][color] overlay [out]" @end example Modified: libavfilter/vf_drawtext.c ============================================================================== --- libavfilter/vf_drawtext.c Sat Nov 13 11:05:28 2010 (r5942) +++ libavfilter/vf_drawtext.c Sun Nov 21 21:21:37 2010 (r5943) @@ -25,10 +25,11 @@ * Drawtext Filter */ -#include "avfilter.h" -#include "parseutils.h" #include "libavutil/colorspace.h" +#include "libavutil/opt.h" #include "libavutil/pixdesc.h" +#include "libavcore/parseutils.h" +#include "avfilter.h" #undef time #include <sys/time.h> @@ -127,7 +128,7 @@ static inline int extract_color(AVFilter { uint8_t rgba[4]; uint8_t err; - if ((err = av_parse_color(rgba, color_str, ctx))) { + if ((err = av_parse_color(rgba, color_str, -1, ctx))) { return err; } color[0] = RGB_TO_Y(rgba[0], rgba[1], rgba[2]);

1 0

[PATCH 0/5] ac3enc commits
by Justin Ruggles 17 Nov '10

17 Nov '10

Justin Ruggles (5): Use av_clip_int16() in FIX15(). Output will differ now in some cases, but the AC3 regtest is unchanged. Use lrintf() in FIX15() macro. This matches the float-to-int16 conversion in audioconvert.c. Regression reference updated. cosmetics: more pretty-printing simplify precision normalization calculation Port encode_exp() changes from Aften. 58% faster in function. old: 55303 dezicycles in encode_exp, 8191 runs, 1 skips new: 23030 dezicycles in encode_exp, 8192 runs, 0 skips libavcodec/ac3enc.c | 180 +++++++++++++++++++++++--------------------------- tests/ref/acodec/ac3 | 2 +- 2 files changed, 84 insertions(+), 98 deletions(-)

3 10

[PATCH 0/9] ac3enc commits
by Justin Ruggles 15 Nov '10

15 Nov '10

Justin Ruggles (9): cosmetics: rearrange AC3EncodeContext fields Change some unsigned types to signed types in AC3EncodeContext cosmetics: change all short to int16_t cosmetics: rename some fields in AC3EncodeContext Remove duplicate AC3EncodeContext fields, sr_shift and sr_code. cosmetics: use better (and shared) macro names for some constant values Clean up debugging and testing. Document AC3EncodeContext fields cosmetics: pretty printing libavcodec/Makefile | 1 + libavcodec/ac3.h | 6 +- libavcodec/ac3dec.h | 11 +- libavcodec/ac3enc.c | 655 +++++++++++++++++++++++++-------------------------- 4 files changed, 328 insertions(+), 345 deletions(-)

2 14

[PATCH 0/2] ac3enc commits
by Justin Ruggles 14 Nov '10

14 Nov '10

Justin Ruggles (2): remove unneeded #include simplify fix15() and convert it to a macro libavcodec/ac3enc.c | 21 ++++++--------------- 1 files changed, 6 insertions(+), 15 deletions(-)

1 2

[soc]: r5942 - in libavfilter: checkout.sh diffs/00_configure.diff diffs/01_build.diff diffs/03_doc_filters.diff
by stefano 13 Nov '10

13 Nov '10

Author: stefano Date: Sat Nov 13 11:05:28 2010 New Revision: 5942 Log: Update to FFmpeg r25741 / libswscale r32571. 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 Nov 2 23:59:33 2010 (r5941) +++ libavfilter/checkout.sh Sat Nov 13 11:05:28 2010 (r5942) @@ -1,7 +1,7 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25657 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25741 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale Modified: libavfilter/diffs/00_configure.diff ============================================================================== --- libavfilter/diffs/00_configure.diff Tue Nov 2 23:59:33 2010 (r5941) +++ libavfilter/diffs/00_configure.diff Sat Nov 13 11:05:28 2010 (r5942) @@ -1,6 +1,6 @@ Index: configure =================================================================== ---- configure (revision 25657) +--- configure (revision 25741) +++ configure (working copy) @@ -170,6 +170,7 @@ and libraw1394 [no] Modified: libavfilter/diffs/01_build.diff ============================================================================== --- libavfilter/diffs/01_build.diff Tue Nov 2 23:59:33 2010 (r5941) +++ libavfilter/diffs/01_build.diff Sat Nov 13 11:05:28 2010 (r5942) @@ -1,18 +1,15 @@ Index: libavfilter/Makefile =================================================================== ---- libavfilter/Makefile (revision 25657) +--- libavfilter/Makefile (revision 25741) +++ libavfilter/Makefile (working copy) -@@ -3,8 +3,9 @@ +@@ -3,6 +3,7 @@ NAME = avfilter FFLIBS = avcodec avcore avutil FFLIBS-$(CONFIG_SCALE_FILTER) += swscale +FFLIBS-$(CONFIG_MOVIE_FILTER) += avformat --HEADERS = avfilter.h -+HEADERS = avfilter.h avfiltergraph.h + HEADERS = avfilter.h avfiltergraph.h - OBJS = allfilters.o \ - avfilter.o \ @@ -25,20 +26,27 @@ OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o OBJS-$(CONFIG_CROPDETECT_FILTER) += vf_cropdetect.o @@ -51,7 +48,7 @@ Index: libavfilter/Makefile OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o Index: libavfilter/allfilters.c =================================================================== ---- libavfilter/allfilters.c (revision 25657) +--- libavfilter/allfilters.c (revision 25741) +++ libavfilter/allfilters.c (working copy) @@ -45,20 +45,27 @@ REGISTER_FILTER (CROP, crop, vf); Modified: libavfilter/diffs/03_doc_filters.diff ============================================================================== --- libavfilter/diffs/03_doc_filters.diff Tue Nov 2 23:59:33 2010 (r5941) +++ libavfilter/diffs/03_doc_filters.diff Sat Nov 13 11:05:28 2010 (r5942) @@ -1,6 +1,6 @@ Index: doc/filters.texi =================================================================== ---- doc/filters.texi (revision 25657) +--- doc/filters.texi (revision 25741) +++ doc/filters.texi (working copy) @@ -257,6 +257,99 @@ drawbox=10:20:200:60:red@@0.5"

1 0

ffmpeg-soc and drawtext filter
by Sebastian 12 Nov '10

12 Nov '10

Hi all, I'm trying to use the drawtext filter to overlay some text on recorded footage. I've compiled and installed ffmpeg-soc/libavfilter from svn repository. I have: FFmpeg version SVN-r25657, Copyright (c) 2000-2010 the FFmpeg developers built on Nov 11 2010 23:05:59 with gcc 4.4.4 configuration: --prefix=/usr --enable-shared --enable-static --enable-nonfree --enable-gpl --enable-libfreetype --enable-swscale --disable-ffserver --enable-libvpx --enable-libx264 --enable-avfilter --enable-libopenjpeg I'm using the following command line: ffmpeg -fflags +genpts -f mjpeg -r 5 -s 640x480 \ -i http://localhost:8081/?action=stream \ -vcodec mpeg4 -b 1000000 -r 5 \ -vf drawtext="fontfile='/usr/share/font/TTF/LiberationSansRegular.ttf' \ :fontsize=18:fgcolor=0xFFFFFF:bgcolor=0x333333:x=10:y=5 \ :text='camera 1 | \%H\:\%M\:\%S | \%d-\%m-\%Y'" \ /home/cctv/test-overlay.avi Ignore the backslash on the next line - this is from my email software. The overlay does appear in the recorded footage - but the problem I have is that "bgcolor" doesn't seem to work. There is simply no background for the overlay. Whatever value I put there - it has no effect whatsoever. "fgcolor" does work, however. Also - the command doesn't spew any errors. Is this by design (i.e. - am I missing something in my syntax) - or is it a bug? Should I file a bug report somewhere? Sebastian

1 0

[soc]: r5941 - in libavfilter: checkout.sh diffs/00_configure.diff diffs/01_build.diff diffs/03_doc_filters.diff vf_setpts.c
by stefano 02 Nov '10

02 Nov '10

Author: stefano Date: Tue Nov 2 23:59:33 2010 New Revision: 5941 Log: Update to FFmpeg r25657 / libswscale r32571. In particular remove the setpts filter, which is now integrated in the main repo. Deleted: libavfilter/vf_setpts.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 Tue Oct 19 00:09:43 2010 (r5940) +++ libavfilter/checkout.sh Tue Nov 2 23:59:33 2010 (r5941) @@ -1,11 +1,11 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25526 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25657 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale -svn up -r32424 +svn up -r32571 cd ../.. echo "patching ffmpeg" @@ -19,7 +19,6 @@ cp \ vf_negate.c \ vf_overlay.c \ vf_rotate.c \ - vf_setpts.c \ vf_split.c \ vsrc_movie.c \ ffmpeg/libavfilter Modified: libavfilter/diffs/00_configure.diff ============================================================================== --- libavfilter/diffs/00_configure.diff Tue Oct 19 00:09:43 2010 (r5940) +++ libavfilter/diffs/00_configure.diff Tue Nov 2 23:59:33 2010 (r5941) @@ -1,6 +1,6 @@ Index: configure =================================================================== ---- configure (revision 25526) +--- configure (revision 25657) +++ configure (working copy) @@ -170,6 +170,7 @@ and libraw1394 [no] @@ -18,7 +18,7 @@ Index: configure libgsm libmp3lame libnut -@@ -1029,6 +1031,7 @@ +@@ -1030,6 +1032,7 @@ llrintf local_aligned_16 local_aligned_8 @@ -26,7 +26,7 @@ Index: configure log2 log2f loongson -@@ -1401,7 +1404,9 @@ +@@ -1405,7 +1408,9 @@ # filters blackframe_filter_deps="gpl" cropdetect_filter_deps="gpl" @@ -36,7 +36,7 @@ Index: configure ocv_smooth_filter_deps="libopencv" yadif_filter_deps="gpl" -@@ -2662,6 +2667,7 @@ +@@ -2666,6 +2671,7 @@ check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss check_func inet_aton $network_extralibs check_func isatty @@ -44,7 +44,7 @@ Index: configure check_func ${malloc_prefix}memalign && enable memalign check_func mkstemp check_func ${malloc_prefix}posix_memalign && enable posix_memalign -@@ -2746,6 +2752,7 @@ +@@ -2750,6 +2756,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 Oct 19 00:09:43 2010 (r5940) +++ libavfilter/diffs/01_build.diff Tue Nov 2 23:59:33 2010 (r5941) @@ -1,6 +1,6 @@ Index: libavfilter/Makefile =================================================================== ---- libavfilter/Makefile (revision 25526) +--- libavfilter/Makefile (revision 25657) +++ libavfilter/Makefile (working copy) @@ -3,8 +3,9 @@ NAME = avfilter @@ -13,7 +13,7 @@ Index: libavfilter/Makefile OBJS = allfilters.o \ avfilter.o \ -@@ -25,19 +26,27 @@ +@@ -25,20 +26,27 @@ OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o OBJS-$(CONFIG_CROPDETECT_FILTER) += vf_cropdetect.o OBJS-$(CONFIG_DRAWBOX_FILTER) += vf_drawbox.o @@ -34,14 +34,14 @@ Index: libavfilter/Makefile OBJS-$(CONFIG_PIXELASPECT_FILTER) += vf_aspect.o +OBJS-$(CONFIG_ROTATE_FILTER) += vf_rotate.o OBJS-$(CONFIG_SCALE_FILTER) += vf_scale.o -+OBJS-$(CONFIG_SETPTS_FILTER) += vf_setpts.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 OBJS-$(CONFIG_UNSHARP_FILTER) += vf_unsharp.o OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o -@@ -45,6 +54,7 @@ +@@ -46,6 +54,7 @@ OBJS-$(CONFIG_BUFFER_FILTER) += vsrc_buffer.o OBJS-$(CONFIG_COLOR_FILTER) += vf_pad.o @@ -51,9 +51,9 @@ Index: libavfilter/Makefile OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o Index: libavfilter/allfilters.c =================================================================== ---- libavfilter/allfilters.c (revision 25526) +--- libavfilter/allfilters.c (revision 25657) +++ libavfilter/allfilters.c (working copy) -@@ -45,19 +45,27 @@ +@@ -45,20 +45,27 @@ REGISTER_FILTER (CROP, crop, vf); REGISTER_FILTER (CROPDETECT, cropdetect, vf); REGISTER_FILTER (DRAWBOX, drawbox, vf); @@ -74,14 +74,14 @@ Index: libavfilter/allfilters.c REGISTER_FILTER (PIXELASPECT, pixelaspect, vf); + REGISTER_FILTER (ROTATE, rotate, vf); REGISTER_FILTER (SCALE, scale, vf); + REGISTER_FILTER (SETPTS, setpts, vf); REGISTER_FILTER (SETTB, settb, vf); -+ REGISTER_FILTER (SETPTS, setpts, vf); REGISTER_FILTER (SLICIFY, slicify, vf); + REGISTER_FILTER (SPLIT, split, vf); REGISTER_FILTER (TRANSPOSE, transpose, vf); REGISTER_FILTER (UNSHARP, unsharp, vf); REGISTER_FILTER (VFLIP, vflip, vf); -@@ -65,6 +73,7 @@ +@@ -66,6 +73,7 @@ REGISTER_FILTER (BUFFER, buffer, vsrc); REGISTER_FILTER (COLOR, color, vsrc); Modified: libavfilter/diffs/03_doc_filters.diff ============================================================================== --- libavfilter/diffs/03_doc_filters.diff Tue Oct 19 00:09:43 2010 (r5940) +++ libavfilter/diffs/03_doc_filters.diff Tue Nov 2 23:59:33 2010 (r5941) @@ -1,6 +1,6 @@ Index: doc/filters.texi =================================================================== ---- doc/filters.texi (revision 25526) +--- doc/filters.texi (revision 25657) +++ doc/filters.texi (working copy) @@ -257,6 +257,99 @@ drawbox=10:20:200:60:red@@0.5" @@ -187,7 +187,7 @@ Index: doc/filters.texi @section pad Add paddings to the input image, and places the original input at the -@@ -438,6 +595,14 @@ +@@ -447,6 +604,14 @@ can be used to test the monowhite pixel format descriptor definition. @@ -202,32 +202,7 @@ Index: doc/filters.texi @section scale Scale the input video to @var{width}:@var{height} and/or convert the image format. -@@ -463,6 +628,24 @@ - - The default value of @var{width} and @var{height} is 0. - -+@section setpts -+ -+@example -+# Start counting PTS from zero -+ffmpeg -i input.avi -vf setpts=PTS-STARTPTS output.avi -+ -+# Fast motion -+ffmpeg -i input.avi -vf setpts=0.5*PTS output.avi -+ -+# Fixed rate 25 fps -+ffmpeg -i input.avi -vf setpts=N*AVTB/25 output.avi -+ -+# Fixed rate 25 fps with some jitter -+ffmpeg -i input.avi -vf 'setpts=AVTB/25*(N+0.05*sin(N*2*PI/25))' output.avi -+@end example -+ -+Modifies the presentation timestamp (PTS) of the input video. -+ - @section settb - - Set the timebase to use for the output frames timestamps. -@@ -508,6 +691,11 @@ +@@ -577,6 +742,11 @@ Adding this in the beginning of filter chains should make filtering faster due to better use of the memory cache. @@ -239,7 +214,7 @@ Index: doc/filters.texi @section transpose Transpose rows with columns in the input video and optionally flip it. -@@ -726,6 +914,27 @@ +@@ -795,6 +965,27 @@ "color=red@@0.2:qcif:10 [color]; [in][color] overlay [out]" @end example

1 0