[SCM] libav/experimental: Better description (merge is too vague IMHO).

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 33a0facf0b88cc2712438432e7b969dffc5b1b49
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Thu Feb 21 22:19:51 2008 +0000

    Better description (merge is too vague IMHO).
    
    Originally committed as revision 12174 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 49d90cf..0a83833 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -168,9 +168,9 @@ AVFilterFormats *avfilter_make_format_list(int len, ...);
 AVFilterFormats *avfilter_all_colorspaces(void);
 
 /**
- * If a and b share at least one common format, they are merged into a new
- * format list which is returned.  All the references to a and b are updated
- * to point to this new list, and a and b are deallocated.
+ * Returns a format list which contains the intersection of the formats of
+ * a and b. And all the references of a and b, and a and b will be
+ * deallocated.
  *
  * If a and b do not share any common formats, neither is modified, and NULL
  * is returned.

-- 
Libav/FFmpeg packaging