git.sesse.net Git - ffmpeg/commit

]> git.sesse.net Git - ffmpeg/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Mon, 17 Feb 2014 20:11:29 +0000 (21:11 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Mon, 17 Feb 2014 20:11:29 +0000 (21:11 +0100)
commit	f3bb5f28d35ee6ba266f72e8d61ffd069c390559
tree	e447347d8778a20ef95a2781e70040eb44235a6f	tree \| snapshot
parent	27f55beba2bf9c94996660556543dce1b3ed04b1	commit \| diff
parent	4d7ab5cfebef91820af2933ef2f622ea598e6b53	commit \| diff

Merge commit '4d7ab5cfebef91820af2933ef2f622ea598e6b53'

* commit '4d7ab5cfebef91820af2933ef2f622ea598e6b53':
doxygen: Add a number of missing function parameter descriptions

Conflicts:
libavformat/avformat.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Unnamed repository; edit this file 'description' to name the repository.