[FFmpeg-cvslog] Merge commit 'a736ae1e96b8718af0962106aa40df5f4b246b55'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 10 23:17:29 2014 +0200| [ac26d7ea9da4758377624e633ca47cd01e2210d2] | committer: Michael Niedermayer

Merge commit 'a736ae1e96b8718af0962106aa40df5f4b246b55'

* commit 'a736ae1e96b8718af0962106aa40df5f4b246b55':
  doc: Document mpegts muxrate

Conflicts:
	doc/muxers.texi

See: 5b76c3a1204944a74f4c1fb4ce1ebe58940e7f78
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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