Merge commit 'c5c663541739cb813a2a5668ee8339b535b35d7d'
authorRodger Combs <rodger.combs@gmail.com>
Tue, 26 Sep 2017 17:13:54 +0000 (14:13 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 26 Sep 2017 17:13:54 +0000 (14:13 -0300)
commit3eb1d05ef719cbb0793f6bd82d7227f9093f6fc3
treef0f250328492ad4739c258e8994d67e0d8d03343
parent1b8ef01f04ab2210a26b59d3a1a62daed52ce88a
parentc5c663541739cb813a2a5668ee8339b535b35d7d
Merge commit 'c5c663541739cb813a2a5668ee8339b535b35d7d'

* commit 'c5c663541739cb813a2a5668ee8339b535b35d7d':
  doc: add dash muxer

Merged-by: Rodger Combs <rodger.combs@gmail.com>
doc/muxers.texi