RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Better description (merge is too vague IMHO). 

Originally committed as revision 12174 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-02-21 22:19:51 +00:00
parent 4c4de9ca49
commit 33a0facf0b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/avfilter.h
View File

@ -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.