[FFmpeg-soc] [soc]: r5914 - in libavfilter: checkout.sh diffs/00_configure.diff diffs/01_build.diff diffs/03_doc_filters.diff vf_hflip.c
stefano
subversion at mplayerhq.hu
Wed Aug 18 01:12:38 CEST 2010
Author: stefano
Date: Wed Aug 18 01:12:38 2010
New Revision: 5914
Log:
Update to FFmpeg r24819 / libswscale r31972.
In particular remove the file vf_hflip.c, as the hflip file is already
integrated in the main FFmpeg repo.
Deleted:
libavfilter/vf_hflip.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 Wed Aug 18 01:10:43 2010 (r5913)
+++ libavfilter/checkout.sh Wed Aug 18 01:12:38 2010 (r5914)
@@ -1,11 +1,11 @@
#! /bin/sh
echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r24776
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r24819
echo "downloading the corresponding version of swscale"
cd ffmpeg/libswscale
-svn up -r31956
+svn up -r31972
cd ../..
echo "patching ffmpeg"
@@ -18,7 +18,6 @@ cp \
vf_fade.c \
vf_fifo.c \
vf_fps.c \
- vf_hflip.c \
vf_negate.c \
vf_overlay.c \
vf_rotate.c \
Modified: libavfilter/diffs/00_configure.diff
==============================================================================
--- libavfilter/diffs/00_configure.diff Wed Aug 18 01:10:43 2010 (r5913)
+++ libavfilter/diffs/00_configure.diff Wed Aug 18 01:12:38 2010 (r5914)
@@ -1,6 +1,6 @@
Index: configure
===================================================================
---- configure (revision 24776)
+--- configure (revision 24819)
+++ configure (working copy)
@@ -168,6 +168,7 @@
and libraw1394 [no]
@@ -37,7 +37,7 @@ Index: configure
# libraries
avdevice_deps="avcodec avformat"
avformat_deps="avcodec"
-@@ -2602,6 +2609,7 @@
+@@ -2603,6 +2610,7 @@
check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss
check_func inet_aton $network_extralibs
check_func isatty
@@ -45,7 +45,7 @@ Index: configure
check_func ${malloc_prefix}memalign && enable memalign
check_func mkstemp
check_func ${malloc_prefix}posix_memalign && enable posix_memalign
-@@ -2684,6 +2692,7 @@
+@@ -2685,6 +2693,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 Wed Aug 18 01:10:43 2010 (r5913)
+++ libavfilter/diffs/01_build.diff Wed Aug 18 01:12:38 2010 (r5914)
@@ -1,6 +1,6 @@
Index: libavfilter/Makefile
===================================================================
---- libavfilter/Makefile (revision 24776)
+--- libavfilter/Makefile (revision 24819)
+++ libavfilter/Makefile (working copy)
@@ -3,8 +3,9 @@
NAME = avfilter
@@ -13,7 +13,7 @@ Index: libavfilter/Makefile
OBJS = allfilters.o \
avfilter.o \
-@@ -16,19 +17,32 @@
+@@ -16,20 +17,32 @@
OBJS-$(CONFIG_ASPECT_FILTER) += vf_aspect.o
OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o
@@ -23,7 +23,7 @@ Index: libavfilter/Makefile
+OBJS-$(CONFIG_FIFO_FILTER) += vf_fifo.o
OBJS-$(CONFIG_FORMAT_FILTER) += vf_format.o
+OBJS-$(CONFIG_FPS_FILTER) += vf_fps.o
-+OBJS-$(CONFIG_HFLIP_FILTER) += vf_hflip.o
+ OBJS-$(CONFIG_HFLIP_FILTER) += vf_hflip.o
+OBJS-$(CONFIG_NEGATE_FILTER) += vf_negate.o
OBJS-$(CONFIG_NOFORMAT_FILTER) += vf_format.o
OBJS-$(CONFIG_NULL_FILTER) += vf_null.o
@@ -48,9 +48,9 @@ Index: libavfilter/Makefile
OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
Index: libavfilter/allfilters.c
===================================================================
---- libavfilter/allfilters.c (revision 24776)
+--- libavfilter/allfilters.c (revision 24819)
+++ libavfilter/allfilters.c (working copy)
-@@ -36,19 +36,32 @@
+@@ -36,20 +36,32 @@
REGISTER_FILTER (ASPECT, aspect, vf);
REGISTER_FILTER (CROP, crop, vf);
@@ -60,7 +60,7 @@ Index: libavfilter/allfilters.c
+ REGISTER_FILTER (FIFO, fifo, vf);
REGISTER_FILTER (FORMAT, format, vf);
+ REGISTER_FILTER (FPS, fps, vf);
-+ REGISTER_FILTER (HFLIP, hflip, vf);
+ REGISTER_FILTER (HFLIP, hflip, vf);
+ REGISTER_FILTER (NEGATE, negate, vf);
REGISTER_FILTER (NOFORMAT, noformat, vf);
REGISTER_FILTER (NULL, null, vf);
Modified: libavfilter/diffs/03_doc_filters.diff
==============================================================================
--- libavfilter/diffs/03_doc_filters.diff Wed Aug 18 01:10:43 2010 (r5913)
+++ libavfilter/diffs/03_doc_filters.diff Wed Aug 18 01:12:38 2010 (r5914)
@@ -1,6 +1,6 @@
Index: doc/filters.texi
===================================================================
---- doc/filters.texi (revision 24776)
+--- doc/filters.texi (revision 24819)
+++ doc/filters.texi (working copy)
@@ -39,6 +39,114 @@
@@ -117,7 +117,7 @@ Index: doc/filters.texi
@section format
Convert the input video to one of the specified pixel formats.
-@@ -56,6 +164,30 @@
+@@ -56,6 +164,14 @@
will convert the input video to the format ``yuv420p''.
@@ -129,14 +129,13 @@ Index: doc/filters.texi
+
+Modifies the framerate of the input video to a chosen one.
+
-+ at section hflip
-+
-+ at example
-+./ffmpeg -i in.avi -vf "hflip" out.avi
-+ at end example
-+
-+Flip the video horizontally.
-+
+ @section hflip
+
+ Flip the input video horizontally.
+@@ -66,6 +182,14 @@
+ ffmpeg -i in.avi -vf "hflip" out.avi
+ @end example
+
+ at section negate
+
+ at example
@@ -148,7 +147,7 @@ Index: doc/filters.texi
@section noformat
Force libavfilter not to use any of the specified pixel formats for the
-@@ -77,6 +209,56 @@
+@@ -87,6 +211,56 @@
Pass the source unchanged to the output.
@@ -205,7 +204,7 @@ Index: doc/filters.texi
@section pad
Add paddings to the input image, and places the original input at the
-@@ -124,6 +306,14 @@
+@@ -134,6 +308,14 @@
can be used to test the monowhite pixel format descriptor definition.
@@ -220,7 +219,7 @@ Index: doc/filters.texi
@section scale
Scale the input video to @var{width}:@var{height} and/or convert the image format.
-@@ -149,6 +339,24 @@
+@@ -159,6 +341,24 @@
The default value of @var{width} and @var{height} is 0.
@@ -245,7 +244,7 @@ Index: doc/filters.texi
@section slicify
Pass the images of input video on to next video filter as multiple
-@@ -164,6 +372,19 @@
+@@ -174,6 +374,19 @@
Adding this in the beginning of filter chains should make filtering
faster due to better use of the memory cache.
@@ -265,7 +264,7 @@ Index: doc/filters.texi
@section unsharp
Sharpen or blur the input video.
-@@ -308,6 +529,27 @@
+@@ -318,6 +531,27 @@
"color=red@@0.2:qcif:10 [color]; [in][color] overlay [out]"
@end example
More information about the FFmpeg-soc
mailing list