[FFmpeg-cvslog] Merge commit '4d7ab5cfebef91820af2933ef2f622ea598e6b53'

Michael Niedermayer git at videolan.org
Mon Feb 17 21:20:31 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 17 21:11:29 2014 +0100| [f3bb5f28d35ee6ba266f72e8d61ffd069c390559] | committer: Michael Niedermayer

Merge commit '4d7ab5cfebef91820af2933ef2f622ea598e6b53'

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

Conflicts:
	libavformat/avformat.h

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f3bb5f28d35ee6ba266f72e8d61ffd069c390559
---





More information about the ffmpeg-cvslog mailing list