Merge commit 'c63418e0a3afbcdbc59fd65c270d45efafe092ce'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Oct 2014 10:58:22 +0000 (12:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Oct 2014 10:59:27 +0000 (12:59 +0200)
commit7ad34f445648b8f0e8e15d67ccd61ca4c9192cdf
treedfb95c584e59c2a0f6a3cd85f45a81a6e3bd2ad8
parent899d3706d8fde29b78d0a72f92cfcd8be6aab419
parentc63418e0a3afbcdbc59fd65c270d45efafe092ce
Merge commit 'c63418e0a3afbcdbc59fd65c270d45efafe092ce'

* commit 'c63418e0a3afbcdbc59fd65c270d45efafe092ce':
  doc: reword the mp3 muxer documentation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/muxers.texi