Merge commit '0e702124ee149593168cbbb7b30376249a64ae66'
authorJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 02:47:50 +0000 (23:47 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 02:47:50 +0000 (23:47 -0300)
commit27aa69896bd6a816026f0fd57b12ad1fc147ab65
treeac25704c3b93f707b5970d20165b9ee80ded0bd2
parent82fc222f676fd4e0dc8328e3abf17fba45d11af5
parent0e702124ee149593168cbbb7b30376249a64ae66
Merge commit '0e702124ee149593168cbbb7b30376249a64ae66'

* commit '0e702124ee149593168cbbb7b30376249a64ae66':
  doc: Provide better examples for hls and segment muxing

Merged-by: James Almer <jamrial@gmail.com>
doc/muxers.texi