[FFmpeg-cvslog] Merge commit '21015109ec0fac0f104a5355f272ecb956ba3f4e'
Michael Niedermayer
git at videolan.org
Wed Aug 28 12:03:11 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 28 11:55:03 2013 +0200| [a13af77f49d79e8994d22e598e4ca82a2f5d09d4] | committer: Michael Niedermayer
Merge commit '21015109ec0fac0f104a5355f272ecb956ba3f4e'
* commit '21015109ec0fac0f104a5355f272ecb956ba3f4e':
doc: Document the flv demuxer
Conflicts:
doc/demuxers.texi
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a13af77f49d79e8994d22e598e4ca82a2f5d09d4
---
More information about the ffmpeg-cvslog
mailing list