diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 04:54:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 04:54:26 +0200 |
| commit | 624327988f747b1adc3a3d405418b0578b6c7e70 (patch) | |
| tree | fd2166657e89e0c2da153b5686027618a94fdc44 /libswscale | |
| parent | 43935842bd1307b084a32ea40d2ed6c8733e034a (diff) | |
| parent | e6e8be542b8e9f6c200b55dd1b444ec517dc85da (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: Completely document the x264 options
Conflicts:
doc/encoders.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions