diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-02-21 22:19:51 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-02-21 22:19:51 +0000 |
| commit | 33a0facf0b88cc2712438432e7b969dffc5b1b49 (patch) | |
| tree | c457f15a3fc75cfa6652bd4efb990d290304eee1 /libavfilter | |
| parent | 4c4de9ca49c4aa99183c96abd333389f7a66f511 (diff) | |
| download | ffmpeg-33a0facf0b88cc2712438432e7b969dffc5b1b49.tar.gz | |
Better description (merge is too vague IMHO).
Originally committed as revision 12174 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/avfilter.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 49d90cf522..0a8383350a 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. |