Merge commit 'a736ae1e96b8718af0962106aa40df5f4b246b55'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Jun 2014 21:17:29 +0000 (23:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Jun 2014 21:25:46 +0000 (23:25 +0200)
commitac26d7ea9da4758377624e633ca47cd01e2210d2
tree950080d0339760a36a44a98dfe70182eb9abf229
parent8d02a55b1b93bfd0574306631d2de7614bfb47b4
parenta736ae1e96b8718af0962106aa40df5f4b246b55
Merge commit 'a736ae1e96b8718af0962106aa40df5f4b246b55'

* commit 'a736ae1e96b8718af0962106aa40df5f4b246b55':
  doc: Document mpegts muxrate

Conflicts:
doc/muxers.texi

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