[FFmpeg-cvslog] Merge commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6'
Michael Niedermayer
git at videolan.org
Mon Jul 7 01:27:24 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 7 00:55:36 2014 +0200| [705eb5a1774938ff6c3bd07af1d7574bf4016581] | committer: Michael Niedermayer
Merge commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6'
* commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6':
audio_fifo: Split into a separate doxygen module
Conflicts:
libavutil/audio_fifo.h
See: 689e02808d09bd0441ec199cb1a8953ac7c666f6
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=705eb5a1774938ff6c3bd07af1d7574bf4016581
---
More information about the ffmpeg-cvslog
mailing list