[FFmpeg-cvslog] Merge remote-tracking branch 'TimothyGu/release/2.0' into release/2.0

[Michael Niedermayer]

ffmpeg | branch: release/2.0 | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 23 22:31:41 2013 +0200| [187297b871a3dca9c90dac5aa6cd65f9c8edb240] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=187297b871a3dca9c90dac5aa6cd65f9c8edb240
---