[FFmpeg-soc] [soc]: r5941 - in libavfilter: checkout.sh diffs/00_configure.diff diffs/01_build.diff diffs/03_doc_filters.diff vf_setpts.c
stefano
subversion at mplayerhq.hu
Tue Nov 2 23:59:33 CET 2010
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.
-
-+ at section setpts
-+
-+ at 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
-+ at 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
More information about the FFmpeg-soc
mailing list