diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-26 14:18:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-26 14:18:48 +0100 |
| commit | d235d240d8ba88b931cb9ca0aca2cfa586c7eea0 (patch) | |
| tree | bdf6e17de3f5e40af72b9e1a60a79b3377488a3f /tools | |
| parent | e7e14bc69a606a6bec82efef729263cd38f122d4 (diff) | |
| parent | ded3673d77943c376d94e8157b1238bbd1eeca2d (diff) | |
| download | ffmpeg-d235d240d8ba88b931cb9ca0aca2cfa586c7eea0.tar.gz | |
Merge commit 'ded3673d77943c376d94e8157b1238bbd1eeca2d'
* commit 'ded3673d77943c376d94e8157b1238bbd1eeca2d':
doc: document libx264 options and mappings
libx264: introduce -x264-params private option
Conflicts:
doc/encoders.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions