diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-23 22:31:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-23 22:31:44 +0200 |
| commit | 187297b871a3dca9c90dac5aa6cd65f9c8edb240 (patch) | |
| tree | dab5cd2344e29a65a62058cc287e8f1020f3466b /doc/multithreading.txt | |
| parent | 211ad5042adcf9f6e8abb9d0f1f3316331481535 (diff) | |
| parent | 6911d9e1b0cffee4cdf5f12be2030b7edbc65a32 (diff) | |
| download | ffmpeg-187297b871a3dca9c90dac5aa6cd65f9c8edb240.tar.gz | |
Merge remote-tracking branch 'TimothyGu/release/2.0' into release/2.0
* TimothyGu/release/2.0:
doc/encoders: add doc for AAC encoder
doc/formats: Add documentation for 3 parameters that have been missing
doc/encoders: improve libvo-aacenc doc
doc/encoders: reformat and add some clarification in libtwolame doc
doc/encoders: reformat libmp3lame doc
doc/encoders: add libxvid doc
doc/encoders: partially rewrite and reformat libx264 docs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/multithreading.txt')
0 files changed, 0 insertions, 0 deletions