ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sat Mar 7
01:16:17 2015 +0100| [665d47f435c8ac759bbf995b3384bfa6dd8e42ad] | committer:
Michael Niedermayer
Merge commit 'cecf45b2bfbb85e9e59f355428fbd4d8cbc652a8'
* commit 'cecf45b2bfbb85e9e59f355428fbd4d8cbc652a8':
doc: Add -list_formats all example for video4linux2
Conflicts:
doc/indevs.texi
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=665d47f435c8ac759bbf995b3384bfa6dd8e42ad
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
