diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-03 01:18:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-03 01:18:26 +0200 |
| commit | ca47aec665e272d32ac35464f1512cc7157aa56b (patch) | |
| tree | 731a8069a16ef499ea701d7b57d1c06c5d830141 /cmdutils.c | |
| parent | 95e26d33d76d00b3684485e623cb10644820870f (diff) | |
| parent | 6db67ac2a4faa138c2799ec399f56211329fc012 (diff) | |
| download | ffmpeg-ca47aec665e272d32ac35464f1512cc7157aa56b.tar.gz | |
Merge remote-tracking branch 'TimothyGu/release/1.2' into release/1.2
* TimothyGu/release/1.2:
doc/encoders: add doc for AAC encoder
doc/encoders: improve libvo-aacenc doc
doc/ffmpeg-formats: Add documentation for 3 parameters that have been missing
doc/encoders: Remove options that were not there when branch was cut from master
doc/encoders: reformat and add some clarification in libtwolame doc
doc/encoders: reformat libmp3lame doc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
0 files changed, 0 insertions, 0 deletions