[FFmpeg-cvslog] Merge commit 'a17ab0e46a9fec7c31cc1be363828184c6ecebf7'
Michael Niedermayer
git at videolan.org
Thu Jan 30 16:00:28 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 30 15:19:51 2014 +0100| [d85284d4aa7d388f33bd8a418df3a3cbe349cd39] | committer: Michael Niedermayer
Merge commit 'a17ab0e46a9fec7c31cc1be363828184c6ecebf7'
* commit 'a17ab0e46a9fec7c31cc1be363828184c6ecebf7':
doc: add decoders.texi
Conflicts:
doc/decoders.texi
doc/ffmpeg.texi
doc/ffplay.texi
See: 5e45f03420945dfeaf66729f5d022e5c15ff5723
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d85284d4aa7d388f33bd8a418df3a3cbe349cd39
---
More information about the ffmpeg-cvslog
mailing list