Commit 609ad432 authored by michael's avatar michael

Better description (merge is too vague IMHO).


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12174 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 91bfed9d
......@@ -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.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment