diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-30 16:00:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-30 16:00:47 +0100 |
| commit | 6dc9d2cf4741203aeac479e8dc1ebe021abf9006 (patch) | |
| tree | 588cd17856d2c2ca7f17aa3fbffff73400a096ec /tests/base64.c | |
| parent | d85284d4aa7d388f33bd8a418df3a3cbe349cd39 (diff) | |
| parent | 64ba831da99c5526b21d510397b449742e92961e (diff) | |
| download | ffmpeg-6dc9d2cf4741203aeac479e8dc1ebe021abf9006.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: document correct option to list encoders
Conflicts:
doc/encoders.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/base64.c')
0 files changed, 0 insertions, 0 deletions