Merge remote-tracking branch 'TimothyGu/release/1.1' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Oct 2013 13:28:03 +0000 (15:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Oct 2013 13:28:11 +0000 (15:28 +0200)
commiteb3330b050ba8c9e4254d6331d670e8a98d1944a
tree31e80aceed31d87320833c2fbbfa03f5dd5cee68
parente31e66948d0a9a3f98afdb49c63208caefed5a61
parenta4acb5b9003833109eaa4b72ef016062b368fe5a
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>