[FFmpeg-soc] [soc]: r5428 - in libavfilter: checkout.sh diffs/01_ffplay_filters.diff diffs/02_ffmpeg_filters.diff diffs/03_libavfilter_doc.diff vf_slicify.c

[stefano]

Author: stefano
Date: Tue Nov  3 23:53:47 2009
New Revision: 5428

Log:
Update to FFmeg r20447, in particular remove the slicify filter, which
is now part of the main repo.

Deleted:
   libavfilter/vf_slicify.c
Modified:
   libavfilter/checkout.sh
   libavfilter/diffs/01_ffplay_filters.diff
   libavfilter/diffs/02_ffmpeg_filters.diff
   libavfilter/diffs/03_libavfilter_doc.diff

Modified: libavfilter/checkout.sh
==============================================================================
--- libavfilter/checkout.sh	Tue Nov  3 23:36:31 2009	(r5427)
+++ libavfilter/checkout.sh	Tue Nov  3 23:53:47 2009	(r5428)
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20444
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20447
 
 echo "downloading the corresponding version of swscale"
 cd ffmpeg/libswscale

Modified: libavfilter/diffs/01_ffplay_filters.diff
==============================================================================
--- libavfilter/diffs/01_ffplay_filters.diff	Tue Nov  3 23:36:31 2009	(r5427)
+++ libavfilter/diffs/01_ffplay_filters.diff	Tue Nov  3 23:53:47 2009	(r5428)
@@ -1,6 +1,6 @@
 Index: ffplay.c
 ===================================================================
---- ffplay.c	(revision 20444)
+--- ffplay.c	(revision 20447)
 +++ ffplay.c	(working copy)
 @@ -29,6 +29,12 @@
  #include "libavcodec/colorspace.h"

Modified: libavfilter/diffs/02_ffmpeg_filters.diff
==============================================================================
--- libavfilter/diffs/02_ffmpeg_filters.diff	Tue Nov  3 23:36:31 2009	(r5427)
+++ libavfilter/diffs/02_ffmpeg_filters.diff	Tue Nov  3 23:53:47 2009	(r5428)
@@ -1,6 +1,6 @@
 Index: ffmpeg.c
 ===================================================================
---- ffmpeg.c	(revision 20444)
+--- ffmpeg.c	(revision 20447)
 +++ ffmpeg.c	(working copy)
 @@ -41,6 +41,13 @@
  #include "libavutil/avstring.h"

Modified: libavfilter/diffs/03_libavfilter_doc.diff
==============================================================================
--- libavfilter/diffs/03_libavfilter_doc.diff	Tue Nov  3 23:36:31 2009	(r5427)
+++ libavfilter/diffs/03_libavfilter_doc.diff	Tue Nov  3 23:53:47 2009	(r5428)
@@ -1,6 +1,6 @@
 Index: doc/libavfilter.texi
 ===================================================================
---- doc/libavfilter.texi	(revision 20444)
+--- doc/libavfilter.texi	(revision 20447)
 +++ doc/libavfilter.texi	(working copy)
 @@ -111,6 +111,20 @@
  
@@ -54,7 +54,7 @@ Index: doc/libavfilter.texi
  @section noformat
  
  Force libavfilter not to use any of the specified pixel formats for the
-@@ -149,6 +187,89 @@
+@@ -149,6 +187,65 @@
  
  Pass the source unchanged to the output.
  
@@ -117,17 +117,13 @@ Index: doc/libavfilter.texi
 +
 +Modifies the presentation timestamp (PTS) of the input video.
 +
-+ at section slicify
-+
-+ at example
-+./ffmpeg -i in.avi -vfilters "slicify=32" out.avi
-+ at end example
-+
-+Pass on input video to next video filter as multiple slices.
-+The parameter is the slice height (16 if not specified).
-+Adding this in the beginning of filter chains should make filtering
-+faster due to the better use of the memory cache.
-+
+ @section slicify
+ 
+ Pass the images of input video on to next video filter as multiple
+@@ -164,6 +261,19 @@
+ Adding this in the beginning of filter chains should make filtering
+ faster due to better use of the memory cache.
+ 
 + at section split
 +
 +See the example in the introduction section.
@@ -144,7 +140,7 @@ Index: doc/libavfilter.texi
  @section vflip
  
  Flip the input video vertically.
-@@ -157,4 +278,30 @@
+@@ -172,4 +282,30 @@
  ./ffmpeg -i in.avi -vfilters "vflip" out.avi
  @end example