diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-07 01:16:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-07 01:16:17 +0100 |
| commit | 665d47f435c8ac759bbf995b3384bfa6dd8e42ad (patch) | |
| tree | f5188f111d2beaab8b3c222d17c97ca50637173e /ffmpeg_vdpau.c | |
| parent | 79f83523f7718ddb292c8e03f27a0b5ee7047230 (diff) | |
| parent | cecf45b2bfbb85e9e59f355428fbd4d8cbc652a8 (diff) | |
| download | ffmpeg-665d47f435c8ac759bbf995b3384bfa6dd8e42ad.tar.gz | |
Merge commit 'cecf45b2bfbb85e9e59f355428fbd4d8cbc652a8'
* commit 'cecf45b2bfbb85e9e59f355428fbd4d8cbc652a8':
doc: Add -list_formats all example for video4linux2
Conflicts:
doc/indevs.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_vdpau.c')
0 files changed, 0 insertions, 0 deletions