[FFmpeg-soc] [soc]: r5937 - libavfilter/diffs/03_doc_filters.diff

[stefano]

Author: stefano
Date: Tue Oct 12 13:05:44 2010
New Revision: 5937

Log:
Remove reference to the third parameter of the overlay filter, it is
not implemented anymore.

Modified:
   libavfilter/diffs/03_doc_filters.diff

Modified: libavfilter/diffs/03_doc_filters.diff
==============================================================================
--- libavfilter/diffs/03_doc_filters.diff	Tue Oct 12 12:31:02 2010	(r5936)
+++ libavfilter/diffs/03_doc_filters.diff	Tue Oct 12 13:05:44 2010	(r5937)
@@ -132,7 +132,7 @@ Index: doc/filters.texi
  @section noformat
  
  Force libavfilter not to use any of the specified pixel formats for the
-@@ -391,6 +500,56 @@
+@@ -391,6 +500,54 @@
  documentation for the exact meaning of the parameters:
  @url{http://opencv.willowgarage.com/documentation/c/image_filtering.html}
  
@@ -169,18 +169,16 @@ Index: doc/filters.texi
 +For example, the following command will insert a transparent PNG
 +logo in the bottom left corner of the input video:
 + at example
-+movie=0:png:logo.png [logo]; [in][logo] overlay=10:main_h-overlay_h-10:1 [out]
++movie=0:png:logo.png [logo]; [in][logo] overlay=10:main_h-overlay_h-10 [out]
 + at end example
 +
-+Notice the last parameter to overlay ":1" - this enables alpha blending.
-+
 +The following example will insert 2 different transparent PNG
 +logos (second logo on bottom right corner):
 + at example
 +movie=0:png:logo1.png [logo1];
 +movie=0:png:logo2.png [logo2];
-+[in][logo1] overlay=10:main_h-overlay_h-10:1 [in+logo1];
-+[in+logo1][logo2] overlay=main_w-overlay_w-10:main_h-overlay_h-10:1 [out]
++[in][logo1] overlay=10:main_h-overlay_h-10 [in+logo1];
++[in+logo1][logo2] overlay=main_w-overlay_w-10:main_h-overlay_h-10 [out]
 + at end example
 +
 +You could chain and add more overlays this way but the efficiency of
@@ -189,7 +187,7 @@ Index: doc/filters.texi
  @section pad
  
  Add paddings to the input image, and places the original input at the
-@@ -438,6 +597,14 @@
+@@ -438,6 +595,14 @@
  
  can be used to test the monowhite pixel format descriptor definition.
  
@@ -204,7 +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 +630,24 @@
+@@ -463,6 +628,24 @@
  
  The default value of @var{width} and @var{height} is 0.
  
@@ -229,7 +227,7 @@ Index: doc/filters.texi
  @section settb
  
  Set the timebase to use for the output frames timestamps.
-@@ -508,6 +693,19 @@
+@@ -508,6 +691,19 @@
  Adding this in the beginning of filter chains should make filtering
  faster due to better use of the memory cache.
  
@@ -249,7 +247,7 @@ Index: doc/filters.texi
  @section unsharp
  
  Sharpen or blur the input video.
-@@ -682,6 +880,27 @@
+@@ -682,6 +878,27 @@
  "color=red@@0.2:qcif:10 [color]; [in][color] overlay [out]"
  @end example