[FFmpeg-soc] [soc]: r5940 - in libavfilter: checkout.sh diffs/00_configure.diff diffs/01_build.diff diffs/03_doc_filters.diff vf_transpose.c
stefano
subversion at mplayerhq.hu
Tue Oct 19 00:09:43 CEST 2010
Author: stefano
Date: Tue Oct 19 00:09:43 2010
New Revision: 5940
Log:
Update to FFmpeg r25526 / libswscale r32424.
In particular remove the transpose filter, which is now integrated
into the main SVN repo.
Deleted:
libavfilter/vf_transpose.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 12 13:44:44 2010 (r5939)
+++ libavfilter/checkout.sh Tue Oct 19 00:09:43 2010 (r5940)
@@ -1,7 +1,7 @@
#! /bin/sh
echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25447
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25526
echo "downloading the corresponding version of swscale"
cd ffmpeg/libswscale
@@ -21,7 +21,6 @@ cp \
vf_rotate.c \
vf_setpts.c \
vf_split.c \
- vf_transpose.c \
vsrc_movie.c \
ffmpeg/libavfilter
Modified: libavfilter/diffs/00_configure.diff
==============================================================================
--- libavfilter/diffs/00_configure.diff Tue Oct 12 13:44:44 2010 (r5939)
+++ libavfilter/diffs/00_configure.diff Tue Oct 19 00:09:43 2010 (r5940)
@@ -1,6 +1,6 @@
Index: configure
===================================================================
---- configure (revision 25447)
+--- configure (revision 25526)
+++ configure (working copy)
@@ -170,6 +170,7 @@
and libraw1394 [no]
@@ -26,7 +26,7 @@ Index: configure
log2
log2f
loongson
-@@ -1400,7 +1403,9 @@
+@@ -1401,7 +1404,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"
-@@ -2661,6 +2666,7 @@
+@@ -2662,6 +2667,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
-@@ -2745,6 +2751,7 @@
+@@ -2746,6 +2752,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 12 13:44:44 2010 (r5939)
+++ libavfilter/diffs/01_build.diff Tue Oct 19 00:09:43 2010 (r5940)
@@ -1,6 +1,6 @@
Index: libavfilter/Makefile
===================================================================
---- libavfilter/Makefile (revision 25447)
+--- libavfilter/Makefile (revision 25526)
+++ libavfilter/Makefile (working copy)
@@ -3,8 +3,9 @@
NAME = avfilter
@@ -13,7 +13,7 @@ Index: libavfilter/Makefile
OBJS = allfilters.o \
avfilter.o \
-@@ -25,25 +26,35 @@
+@@ -25,19 +26,27 @@
OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o
OBJS-$(CONFIG_CROPDETECT_FILTER) += vf_cropdetect.o
OBJS-$(CONFIG_DRAWBOX_FILTER) += vf_drawbox.o
@@ -38,10 +38,10 @@ Index: libavfilter/Makefile
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_TRANSPOSE_FILTER) += vf_transpose.o
OBJS-$(CONFIG_UNSHARP_FILTER) += vf_unsharp.o
OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o
- OBJS-$(CONFIG_YADIF_FILTER) += vf_yadif.o
+@@ -45,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 25447)
+--- libavfilter/allfilters.c (revision 25526)
+++ libavfilter/allfilters.c (working copy)
-@@ -45,25 +45,35 @@
+@@ -45,19 +45,27 @@
REGISTER_FILTER (CROP, crop, vf);
REGISTER_FILTER (CROPDETECT, cropdetect, vf);
REGISTER_FILTER (DRAWBOX, drawbox, vf);
@@ -78,10 +78,10 @@ Index: libavfilter/allfilters.c
+ REGISTER_FILTER (SETPTS, setpts, vf);
REGISTER_FILTER (SLICIFY, slicify, vf);
+ REGISTER_FILTER (SPLIT, split, vf);
-+ REGISTER_FILTER (TRANSPOSE, transpose, vf);
+ REGISTER_FILTER (TRANSPOSE, transpose, vf);
REGISTER_FILTER (UNSHARP, unsharp, vf);
REGISTER_FILTER (VFLIP, vflip, vf);
- REGISTER_FILTER (YADIF, yadif, vf);
+@@ -65,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 12 13:44:44 2010 (r5939)
+++ libavfilter/diffs/03_doc_filters.diff Tue Oct 19 00:09:43 2010 (r5940)
@@ -1,6 +1,6 @@
Index: doc/filters.texi
===================================================================
---- doc/filters.texi (revision 25447)
+--- doc/filters.texi (revision 25526)
+++ doc/filters.texi (working copy)
@@ -257,6 +257,99 @@
drawbox=10:20:200:60:red@@0.5"
@@ -227,7 +227,7 @@ Index: doc/filters.texi
@section settb
Set the timebase to use for the output frames timestamps.
-@@ -508,6 +691,19 @@
+@@ -508,6 +691,11 @@
Adding this in the beginning of filter chains should make filtering
faster due to better use of the memory cache.
@@ -236,18 +236,10 @@ Index: doc/filters.texi
+See the example in the introduction section.
+The input video is passed on to two outputs.
+
-+ at section transpose
-+
-+ at example
-+./ffmpeg -i in.avi -vf "transpose" out.avi
-+ at end example
-+
-+Transpose (line => column) input video to next video filter.
-+
- @section unsharp
+ @section transpose
- Sharpen or blur the input video.
-@@ -682,6 +878,27 @@
+ Transpose rows with columns in the input video and optionally flip it.
+@@ -726,6 +914,27 @@
"color=red@@0.2:qcif:10 [color]; [in][color] overlay [out]"
@end example
More information about the FFmpeg-soc
mailing list