Merge commit 'cecf45b2bfbb85e9e59f355428fbd4d8cbc652a8'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 7 Mar 2015 00:16:17 +0000 (01:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 7 Mar 2015 00:16:17 +0000 (01:16 +0100)
commit665d47f435c8ac759bbf995b3384bfa6dd8e42ad
treef5188f111d2beaab8b3c222d17c97ca50637173e
parent79f83523f7718ddb292c8e03f27a0b5ee7047230
parentcecf45b2bfbb85e9e59f355428fbd4d8cbc652a8
Merge commit 'cecf45b2bfbb85e9e59f355428fbd4d8cbc652a8'

* commit 'cecf45b2bfbb85e9e59f355428fbd4d8cbc652a8':
  doc: Add -list_formats all example for video4linux2

Conflicts:
doc/indevs.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/indevs.texi