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

[stefano]

Author: stefano
Date: Wed Oct 21 23:42:18 2009
New Revision: 5422

Log:
Update to FFmpeg r20344. In particular remove the vf_crop.c filter,
since it is in the main repo.

Added:
   libavfilter/diffs/03_libavfilter_doc.diff   (contents, props changed)
      - copied, changed from r5417, libavfilter/diffs/03_vfilters_doc.diff
Deleted:
   libavfilter/diffs/03_vfilters_doc.diff
   libavfilter/vf_crop.c
Modified:
   libavfilter/checkout.sh
   libavfilter/diffs/01_ffplay_filters.diff
   libavfilter/diffs/02_ffmpeg_filters.diff

Modified: libavfilter/checkout.sh
==============================================================================
--- libavfilter/checkout.sh	Tue Oct 20 23:19:55 2009	(r5421)
+++ libavfilter/checkout.sh	Wed Oct 21 23:42:18 2009	(r5422)
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20303
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20344
 
 echo "downloading the corresponding version of swscale"
 cd ffmpeg/libswscale

Modified: libavfilter/diffs/01_ffplay_filters.diff
==============================================================================
--- libavfilter/diffs/01_ffplay_filters.diff	Tue Oct 20 23:19:55 2009	(r5421)
+++ libavfilter/diffs/01_ffplay_filters.diff	Wed Oct 21 23:42:18 2009	(r5422)
@@ -1,6 +1,6 @@
 Index: ffplay.c
 ===================================================================
---- ffplay.c	(revision 20303)
+--- ffplay.c	(revision 20344)
 +++ 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 Oct 20 23:19:55 2009	(r5421)
+++ libavfilter/diffs/02_ffmpeg_filters.diff	Wed Oct 21 23:42:18 2009	(r5422)
@@ -1,6 +1,6 @@
 Index: ffmpeg.c
 ===================================================================
---- ffmpeg.c	(revision 20303)
+--- ffmpeg.c	(revision 20344)
 +++ ffmpeg.c	(working copy)
 @@ -41,6 +41,13 @@
  #include "libavutil/avstring.h"

Copied and modified: libavfilter/diffs/03_libavfilter_doc.diff (from r5417, libavfilter/diffs/03_vfilters_doc.diff)
==============================================================================
--- libavfilter/diffs/03_vfilters_doc.diff	Mon Oct 19 01:55:41 2009	(r5417, copy source)
+++ libavfilter/diffs/03_libavfilter_doc.diff	Wed Oct 21 23:42:18 2009	(r5422)
@@ -1,20 +1,11 @@
-Index: doc/vfilters.texi
+Index: doc/libavfilter.texi
 ===================================================================
---- doc/vfilters.texi	(revision 20303)
-+++ doc/vfilters.texi	(working copy)
-@@ -80,8 +80,190 @@
+--- doc/libavfilter.texi	(revision 20344)
++++ doc/libavfilter.texi	(working copy)
+@@ -111,8 +111,185 @@
  
- Below is a description of the currently available video filters.
+ The default value of ``w'' and ``h'' is 0.
  
-+ at section crop
-+
-+ at example
-+./ffmpeg -i in.avi -vfilters "crop=0:0:-1:240" out.avi
-+ at end example
-+
-+Crop the input video to x:y:width:height.
-+The -1 in width or height means that dimension in the input video.
-+
 + at section drawbox
 +
 + at example
@@ -62,10 +53,10 @@ Index: doc/vfilters.texi
 +
 +Convert a video to its negative.
 +
- @section null
- 
- Pass the source unchanged to the output.
- 
++  @section null
++  
++  Pass the source unchanged to the output.
++  
 + at section noformat
 +
 + at example
@@ -75,6 +66,10 @@ Index: doc/vfilters.texi
 +Force libavfilter not to send any of the specified pixel formats to the
 +next filter.
 +
+ @section null
+ 
+ Pass the source unchanged to the output.
+ 
 + at section overlay
 +
 +Overlay one video on top of another (see the example in the introduction