diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-11 15:28:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-11 15:28:11 +0200 |
| commit | eb3330b050ba8c9e4254d6331d670e8a98d1944a (patch) | |
| tree | 31e80aceed31d87320833c2fbbfa03f5dd5cee68 /libavformat/icodec.c | |
| parent | e31e66948d0a9a3f98afdb49c63208caefed5a61 (diff) | |
| parent | a4acb5b9003833109eaa4b72ef016062b368fe5a (diff) | |
| download | ffmpeg-eb3330b050ba8c9e4254d6331d670e8a98d1944a.tar.gz | |
Merge remote-tracking branch 'TimothyGu/release/1.1' into release/1.1
* TimothyGu/release/1.1:
doc/encoders: add doc for AAC encoder
doc/ffmpeg-formats: Add documentation for 2 parameters that have been missing
doc/encoders: improve libvo-aacenc doc
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 'libavformat/icodec.c')
0 files changed, 0 insertions, 0 deletions